Index: lams_learning/build.xml
===================================================================
diff -u -r8f9289d1938ed6d9107f8da808e8288b6a98e75d -r937a2bbf2f083f7f56308f58ef5a805114a3c760
--- lams_learning/build.xml	(.../build.xml)	(revision 8f9289d1938ed6d9107f8da808e8288b6a98e75d)
+++ lams_learning/build.xml	(.../build.xml)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
@@ -226,7 +226,7 @@
 				<include name="**/web/form/*.java" />
 			</fileset>
 
-			<deploymentdescriptor servletspec="2.3"
+			<deploymentdescriptor servletspec="2.4" distributable="false"
 				destdir="${conf.webinf.dir}" mergedir="${conf.xdoclet.dir}"
 				sessiontimeout="${sessiontimeout}" />
 
Index: lams_learning/conf/xdoclet/servlets.xml
===================================================================
diff -u -r9f4fe68406ac46863346862a9d96bc87fe75d5b8 -r937a2bbf2f083f7f56308f58ef5a805114a3c760
--- lams_learning/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 9f4fe68406ac46863346862a9d96bc87fe75d5b8)
+++ lams_learning/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
@@ -47,23 +47,23 @@
 </servlet>
 
 <servlet>
-		<servlet-name>exportPortfolio</servlet-name>
-		<display-name>Export Portfolio</display-name>
 		<description>Export Portfolio</description>		
+		<display-name>Export Portfolio</display-name>
+		<servlet-name>exportPortfolio</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.MainExportServlet</servlet-class>
 	</servlet>
 	
 	<servlet>
-		<servlet-name>exportDownload</servlet-name>
-		<display-name>Export Portfolio Download</display-name>
 		<description>Export Portfolio Download Page</description>		
+		<display-name>Export Portfolio Download</display-name>
+		<servlet-name>exportDownload</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.ExportDownloadServlet</servlet-class>
 	</servlet>
 	
 	<servlet>
-		<servlet-name>exportNotSupported</servlet-name>
-		<display-name>Export Portfolio Unavailable</display-name>
 		<description>Tool does not support portfolio exports</description>
+		<display-name>Export Portfolio Unavailable</display-name>
+		<servlet-name>exportNotSupported</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.ExportNotSupportedServlet</servlet-class>
 	</servlet>
 	
Index: lams_learning/conf/xdoclet/taglibs.xml
===================================================================
diff -u -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7 -r937a2bbf2f083f7f56308f58ef5a805114a3c760
--- lams_learning/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
+++ lams_learning/conf/xdoclet/taglibs.xml	(.../taglibs.xml)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
@@ -1,96 +1,66 @@
-<!--
-	Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	<jsp-config>
 	
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-	USA
-	
-	http://www.gnu.org/licenses/gpl.txt
--->
-
-<!-- Struts Tag Library Defintions -->
-<taglib>
-	<taglib-uri>tags-bean</taglib-uri>
-	<taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-html</taglib-uri>
-	<taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-logic</taglib-uri>
-	<taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-tiles</taglib-uri>
-	<taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-bean-el</taglib-uri>
-	<taglib-location>
-		/WEB-INF/struts/tlds/struts-bean-el.tld
-	</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-html-el</taglib-uri>
-	<taglib-location>
-		/WEB-INF/struts/tlds/struts-html-el.tld
-	</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-logic-el</taglib-uri>
-	<taglib-location>
-		/WEB-INF/struts/tlds/struts-logic-el.tld
-	</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-tiles-el</taglib-uri>
-	<taglib-location>
-		/WEB-INF/struts/tlds/struts-tiles-el.tld
-	</taglib-location>
-</taglib>
-
-<!-- JSTL Tag Library Defintions -->
-<taglib>
-	<taglib-uri>tags-fmt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-fmt-rt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/tlds/fmt-rt.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-core</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-core-rt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/tlds/c-rt.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-xml</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-xml_rt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/tlds/x-rt.tld</taglib-location>
-</taglib>
-
-<!--  ======================================================== -->	
-<!--   LAMS Tag Library -->
-<!--  ======================================================== -->	
-<taglib>
-   <taglib-uri>tags-lams</taglib-uri>
-   <taglib-location>/WEB-INF/lams.tld</taglib-location>
-</taglib>
\ No newline at end of file
+		<!--  ======================================================== -->	
+		<!-- Struts Tag Library Descriptors -->
+		<!--  ======================================================== -->	
+		<taglib>
+		    <taglib-uri>tags-bean</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
+		</taglib>
+		
+		<taglib>
+		    <taglib-uri>tags-html</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
+		</taglib>
+		
+		<taglib>
+		    <taglib-uri>tags-logic</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
+		</taglib>
+		
+		<taglib>
+		    <taglib-uri>tags-tiles</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
+		</taglib>
+		
+		<!--  ======================================================== -->	
+		<!--  JSTL 1.2 Tag Library 									   -->
+		<!--  ======================================================== -->	
+		  <taglib>
+		    <taglib-uri>tags-fmt</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+		  </taglib>
+		
+		  <taglib>
+		    <taglib-uri>tags-core</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+		  </taglib>
+		
+		  <taglib>
+		    <taglib-uri>tags-function</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+		  </taglib>
+		
+		  <taglib>
+		    <taglib-uri>tags-xml</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+		  </taglib>
+		
+		<!--  ======================================================== -->	
+		<!--   Customized Tag Library -->
+		<!--  ======================================================== -->	
+		<taglib>
+		    <taglib-uri>fck-editor</taglib-uri>
+		    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
+		</taglib>
+		
+		<!--  ======================================================== -->	
+		<!--   LAMS Tag Library -->
+		<!--  ======================================================== -->	
+		<taglib>
+		   <taglib-uri>tags-lams</taglib-uri>
+		   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+		</taglib>
+		
+	</jsp-config>
+	
\ No newline at end of file
Index: lams_learning/conf/xdoclet/web-security.xml
===================================================================
diff -u -r01e9227db8d63e8273bb20a34ec2ffa9d8458d60 -r937a2bbf2f083f7f56308f58ef5a805114a3c760
--- lams_learning/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 01e9227db8d63e8273bb20a34ec2ffa9d8458d60)
+++ lams_learning/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
@@ -35,5 +35,6 @@
 		<realm-name>LAMS</realm-name>
    		<form-login-config>
     		<form-login-page>/login.jsp</form-login-page>
+    		<form-error-page>/login.jsp</form-error-page>
    		</form-login-config>
    	</login-config>
Index: lams_learning/test/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r29879f8cfb5c99a316f3745364f1913c6c4559d3 -r937a2bbf2f083f7f56308f58ef5a805114a3c760
--- lams_learning/test/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 29879f8cfb5c99a316f3745364f1913c6c4559d3)
+++ lams_learning/test/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
@@ -20,10 +21,6 @@
 http://www.gnu.org/licenses/gpl.txt
 -->
 
-<!DOCTYPE tiles-definitions PUBLIC
-   "-//Apache Software Foundation//DTD Tiles Configuration//EN"
-   "http://jakarta.apache.org/struts/dtds/tiles-config.dtd">
- 
 <tiles-definitions>
 	
 	<!-- Standard layout with css. -->
Fisheye: Tag 937a2bbf2f083f7f56308f58ef5a805114a3c760 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/jstl/tlds/c-rt.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/WEB-INF/jstl/tlds/c.tld
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -r937a2bbf2f083f7f56308f58ef5a805114a3c760
--- lams_learning/web/WEB-INF/jstl/tlds/c.tld	(.../c.tld)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/WEB-INF/jstl/tlds/c.tld	(.../c.tld)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
@@ -1,415 +1,562 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib
-  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-  "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
-  <tlib-version>1.0</tlib-version>
-  <jsp-version>1.2</jsp-version>
-  <short-name>c</short-name>
-  <uri>http://java.sun.com/jstl/core</uri>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+    version="2.0">
+    
+  <description>JSTL 1.1 core library</description>
   <display-name>JSTL core</display-name>
-  <description>JSTL 1.0 core library</description>
+  <tlib-version>1.1</tlib-version>
+  <short-name>c</short-name>
+  <uri>http://java.sun.com/jsp/jstl/core</uri>
 
   <validator>
+    <description>
+        Provides core validation features for JSTL tags.
+    </description>
     <validator-class>
-	org.apache.taglibs.standard.tlv.JstlCoreTLV
+        org.apache.taglibs.standard.tlv.JstlCoreTLV
     </validator-class>
-    <init-param>
-	<param-name>expressionAttributes</param-name>
-	<param-value>
-	    out:value
-	    out:default
-	    out:escapeXml
-	    if:test
-	    import:url
-	    import:context
-	    import:charEncoding
-	    forEach:items
-	    forEach:begin
-	    forEach:end
-	    forEach:step
-	    forTokens:items
-	    forTokens:begin
-	    forTokens:end
-	    forTokens:step
-	    param:encode
-	    param:name
-	    param:value
-            redirect:context
-            redirect:url
-	    set:property
-	    set:target
-	    set:value
-	    url:context
-	    url:value
-	    when:test
-	</param-value>
-	<description>
-	    Whitespace-separated list of colon-separated token pairs
-	    describing tag:attribute combinations that accept expressions.
-	    The validator uses this information to determine which
-	    attributes need their syntax validated.
-	</description>
-     </init-param>
   </validator>
 
   <tag>
-    <name>catch</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.CatchTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
         Catches any Throwable that occurs in its body and optionally
         exposes it.
     </description>
+    <name>catch</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.CatchTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Name of the exported scoped variable for the
+exception thrown from a nested action. The type of the
+scoped variable is the type of the exception thrown.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
+    <description>
+	Simple conditional tag that establishes a context for
+	mutually exclusive conditional operations, marked by
+	&lt;when&gt; and &lt;otherwise&gt;
+    </description>
     <name>choose</name>
     <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
     <body-content>JSP</body-content>
-    <description>
-        Simple conditional tag that establishes a context for
-        mutually exclusive conditional operations, marked by
-        &lt;when&gt; and &lt;otherwise&gt;
-    </description>
   </tag>
 
   <tag>
-    <name>out</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.core.OutTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
-	Like &lt;%= ... &gt;, but for expressions.
+	Simple conditional tag, which evalutes its body if the
+	supplied condition is true and optionally exposes a Boolean
+	scripting variable representing the evaluation of this condition
     </description>
-    <attribute>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>default</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>escapeXml</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
     <name>if</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.core.IfTag</tag-class>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.IfTag</tag-class>
     <body-content>JSP</body-content>
-    <description>
-        Simple conditional tag, which evalutes its body if the
-        supplied condition is true and optionally exposes a Boolean
-        scripting variable representing the evaluation of this condition
-    </description>
     <attribute>
+        <description>
+The test condition that determines whether or
+not the body content should be processed.
+        </description>
         <name>test</name>
         <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
+	<type>boolean</type>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable for the
+resulting value of the test condition. The type
+of the scoped variable is Boolean.        
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope for var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
+    <description>
+        Retrieves an absolute or relative URL and exposes its contents
+        to either the page, a String in 'var', or a Reader in 'varReader'.
+    </description>
     <name>import</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.core.ImportTag</tag-class>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.ImportTag</tag-class>
     <tei-class>org.apache.taglibs.standard.tei.ImportTEI</tei-class>
     <body-content>JSP</body-content>
-    <description>
-	Retrieves an absolute or relative URL and exposes its contents
-	to either the page, a String in 'var', or a Reader in 'varReader'.
-    </description>
     <attribute>
+        <description>
+The URL of the resource to import.
+        </description>
         <name>url</name>
         <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable for the
+resource's content. The type of the scoped
+variable is String.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope for var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable for the
+resource's content. The type of the scoped
+variable is Reader.
+        </description>
         <name>varReader</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the context when accessing a relative
+URL resource that belongs to a foreign
+context.
+        </description>
         <name>context</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Character encoding of the content at the input
+resource.
+        </description>
         <name>charEncoding</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>forEach</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.core.ForEachTag</tag-class>
-    <tei-class>org.apache.taglibs.standard.tei.ForEachTEI</tei-class>
-    <body-content>JSP</body-content>
     <description>
 	The basic iteration tag, accepting many different
         collection types and supporting subsetting and other
         functionality
     </description>
+    <name>forEach</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.ForEachTag</tag-class>
+    <tei-class>org.apache.taglibs.standard.tei.ForEachTEI</tei-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Collection of items to iterate over.
+        </description>
 	<name>items</name>
 	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
+	<rtexprvalue>true</rtexprvalue>
+	<type>java.lang.Object</type>
     </attribute>
     <attribute>
+        <description>
+If items specified:
+Iteration begins at the item located at the
+specified index. First item of the collection has
+index 0.
+If items not specified:
+Iteration begins with index set at the value
+specified.
+        </description>
 	<name>begin</name>
 	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
     </attribute>
     <attribute>
+        <description>
+If items specified:
+Iteration ends at the item located at the
+specified index (inclusive).
+If items not specified:
+Iteration ends when index reaches the value
+specified.
+        </description>
 	<name>end</name>
 	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
     </attribute>
     <attribute>
+        <description>
+Iteration will only process every step items of
+the collection, starting with the first one.
+        </description>
 	<name>step</name>
 	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable for the
+current item of the iteration. This scoped
+variable has nested visibility. Its type depends
+on the object of the underlying collection.
+        </description>
 	<name>var</name>
 	<required>false</required>
 	<rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable for the
+status of the iteration. Object exported is of type
+javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested
+visibility.
+        </description>
 	<name>varStatus</name>
 	<required>false</required>
 	<rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>forTokens</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.core.ForTokensTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
 	Iterates over tokens, separated by the supplied delimeters
     </description>
+    <name>forTokens</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.ForTokensTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+String of tokens to iterate over.
+        </description>
 	<name>items</name>
 	<required>true</required>
-	<rtexprvalue>false</rtexprvalue>
+	<rtexprvalue>true</rtexprvalue>
+	<type>java.lang.String</type>
     </attribute>
     <attribute>
+        <description>
+The set of delimiters (the characters that
+separate the tokens in the string).
+        </description>
 	<name>delims</name>
 	<required>true</required>
-	<rtexprvalue>false</rtexprvalue>
+	<rtexprvalue>true</rtexprvalue>
+	<type>java.lang.String</type>
     </attribute>
     <attribute>
+        <description>
+Iteration begins at the token located at the
+specified index. First token has index 0.
+        </description>
 	<name>begin</name>
 	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
     </attribute>
     <attribute>
+        <description>
+Iteration ends at the token located at the
+specified index (inclusive).
+        </description>
 	<name>end</name>
 	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
     </attribute>
     <attribute>
+        <description>
+Iteration will only process every step tokens
+of the string, starting with the first one.
+        </description>
 	<name>step</name>
 	<required>false</required>
-	<rtexprvalue>false</rtexprvalue>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable for the
+current item of the iteration. This scoped
+variable has nested visibility.
+        </description>
 	<name>var</name>
 	<required>false</required>
 	<rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable for the
+status of the iteration. Object exported is of
+type
+javax.servlet.jsp.jstl.core.LoopTag
+Status. This scoped variable has nested
+visibility.
+        </description>
 	<name>varStatus</name>
 	<required>false</required>
 	<rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>otherwise</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
+    <description>
+        Like &lt;%= ... &gt;, but for expressions.
+    </description> 
+    <name>out</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.OutTag</tag-class>
     <body-content>JSP</body-content>
+    <attribute>
+        <description>
+Expression to be evaluated.
+        </description>
+        <name>value</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Default value if the resulting value is null.
+        </description>
+        <name>default</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Determines whether characters &lt;,&gt;,&amp;,'," in the
+resulting string should be converted to their
+corresponding character entity codes. Default value is
+true.
+        </description>
+        <name>escapeXml</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+
+  <tag>
     <description>
-	Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
-	and runs only if all of the prior conditions evaluated to
-	'false'
+        Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
+        and runs only if all of the prior conditions evaluated to
+        'false'
     </description>
+    <name>otherwise</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
+    <body-content>JSP</body-content>
   </tag>
 
   <tag>
-    <name>param</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.core.ParamTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
-	Adds a parameter to a containing 'import' tag's URL.
+        Adds a parameter to a containing 'import' tag's URL.
     </description>
+    <name>param</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.ParamTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Name of the query string parameter.
+        </description>
         <name>name</name>
         <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Value of the parameter.
+        </description>
         <name>value</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>redirect</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.core.RedirectTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
-	Redirects to a new URL.
+        Redirects to a new URL.
     </description>
+    <name>redirect</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.RedirectTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
-        <name>var</name>
+        <description>
+The URL of the resource to redirect to.
+        </description>
+        <name>url</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>url</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
+        <description>
+Name of the context when redirecting to a relative URL
+resource that belongs to a foreign context.
+        </description>
         <name>context</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
+    <description>
+        Removes a scoped variable (from a particular scope, if specified).
+    </description>
     <name>remove</name>
     <tag-class>org.apache.taglibs.standard.tag.common.core.RemoveTag</tag-class>
     <body-content>empty</body-content>
-    <description>
-	Removes a scoped variable (from a particular scope, if specified).
-    </description>
     <attribute>
+        <description>
+Name of the scoped variable to be removed.
+        </description>
         <name>var</name>
         <required>true</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope for var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
-  <tag>
-    <name>set</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.core.SetTag</tag-class>
-    <body-content>JSP</body-content>
+ <tag>
     <description>
-	Sets the result of an expression evaluation in a 'scope'
+        Sets the result of an expression evaluation in a 'scope'
     </description>
+    <name>set</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.SetTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Name of the exported scoped variable to hold the value
+specified in the action. The type of the scoped variable is
+whatever type the value expression evaluates to.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Expression to be evaluated.
+        </description>
         <name>value</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Target object whose property will be set. Must evaluate to
+a JavaBeans object with setter property property, or to a
+java.util.Map object.
+        </description>
         <name>target</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the property to be set in the target object.
+        </description>
         <name>property</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope for var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>url</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.core.UrlTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
-	Prints or exposes a URL with optional query parameters
-        (via the c:param tag).
+        Creates a URL with optional query parameters.
     </description>
+    <name>url</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.UrlTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Name of the exported scoped variable for the
+processed url. The type of the scoped variable is
+String.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope for var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+URL to be processed.
+        </description>
         <name>value</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the context when specifying a relative URL
+resource that belongs to a foreign context.
+        </description>
         <name>context</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>when</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.core.WhenTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
-        Subtag of &lt;choose&gt; that includes its body if its
-        condition evalutes to 'true'
+	Subtag of &lt;choose&gt; that includes its body if its
+	condition evalutes to 'true'
     </description>
+    <name>when</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.core.WhenTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+The test condition that determines whether or not the
+body content should be processed.
+        </description>
         <name>test</name>
         <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
+	<type>boolean</type>
     </attribute>
   </tag>
 
Fisheye: Tag 937a2bbf2f083f7f56308f58ef5a805114a3c760 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/jstl/tlds/fmt-rt.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/WEB-INF/jstl/tlds/fmt.tld
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -r937a2bbf2f083f7f56308f58ef5a805114a3c760
--- lams_learning/web/WEB-INF/jstl/tlds/fmt.tld	(.../fmt.tld)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/WEB-INF/jstl/tlds/fmt.tld	(.../fmt.tld)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
@@ -1,438 +1,667 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib
-  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-  "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
-  <tlib-version>1.0</tlib-version>
-  <jsp-version>1.2</jsp-version>
-  <short-name>fmt</short-name>
-  <uri>http://java.sun.com/jstl/fmt</uri>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+    version="2.0">
+    
+  <description>JSTL 1.1 i18n-capable formatting library</description>
   <display-name>JSTL fmt</display-name>
-  <description>JSTL 1.0 i18n-capable formatting library</description>
+  <tlib-version>1.1</tlib-version>
+  <short-name>fmt</short-name>
+  <uri>http://java.sun.com/jsp/jstl/fmt</uri>
 
   <validator>
+    <description>
+        Provides core validation features for JSTL tags.
+    </description>
     <validator-class>
-	org.apache.taglibs.standard.tlv.JstlFmtTLV
+        org.apache.taglibs.standard.tlv.JstlFmtTLV
     </validator-class>
-    <init-param>
-	<param-name>expressionAttributes</param-name>
-	<param-value>
-            requestEncoding:value 
-	    setLocale:value
-	    setLocale:variant
-	    timeZone:value
-	    setTimeZone:value
-	    bundle:basename
-	    bundle:prefix
-            setBundle:basename
-	    message:key
-	    message:bundle
-	    param:value
-	    formatNumber:value
-	    formatNumber:pattern
-            formatNumber:currencyCode
-            formatNumber:currencySymbol
-            formatNumber:groupingUsed
-            formatNumber:maxIntegerDigits
-            formatNumber:minIntegerDigits
-            formatNumber:maxFractionDigits
-            formatNumber:minFractionDigits
-	    parseNumber:value
-	    parseNumber:pattern
-	    parseNumber:parseLocale
-            parseNumber:integerOnly
-	    formatDate:value
-	    formatDate:pattern
-	    formatDate:timeZone
-	    parseDate:value
-	    parseDate:pattern
-	    parseDate:timeZone
-	    parseDate:parseLocale
-	</param-value>
-	<description>
-	    Whitespace-separated list of colon-separated token pairs
-	    describing tag:attribute combinations that accept expressions.
-	    The validator uses this information to determine which
-	    attributes need their syntax validated.
-	</description>
-     </init-param>
   </validator>
 
   <tag>
-    <name>requestEncoding</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.fmt.RequestEncodingTag</tag-class>
-    <body-content>empty</body-content>
     <description>
         Sets the request character encoding
     </description>
+    <name>requestEncoding</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.RequestEncodingTag</tag-class>
+    <body-content>empty</body-content>
     <attribute>
+        <description>
+Name of character encoding to be applied when
+decoding request parameters.
+        </description>
         <name>value</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>setLocale</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.fmt.SetLocaleTag</tag-class>
-    <body-content>empty</body-content>
     <description>
         Stores the given locale in the locale configuration variable
     </description>
+    <name>setLocale</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetLocaleTag</tag-class>
+    <body-content>empty</body-content>
     <attribute>
+        <description>
+A String value is interpreted as the
+printable representation of a locale, which
+must contain a two-letter (lower-case)
+language code (as defined by ISO-639),
+and may contain a two-letter (upper-case)
+country code (as defined by ISO-3166).
+Language and country codes must be
+separated by hyphen (-) or underscore
+(_).        
+	</description>
         <name>value</name>
         <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Vendor- or browser-specific variant.
+See the java.util.Locale javadocs for
+more information on variants.
+        </description>
         <name>variant</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope of the locale configuration variable.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>timeZone</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.fmt.TimeZoneTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
         Specifies the time zone for any time formatting or parsing actions
         nested in its body
     </description>
+    <name>timeZone</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.TimeZoneTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+The time zone. A String value is interpreted as
+a time zone ID. This may be one of the time zone
+IDs supported by the Java platform (such as
+"America/Los_Angeles") or a custom time zone
+ID (such as "GMT-8"). See
+java.util.TimeZone for more information on
+supported time zone formats.
+        </description>
         <name>value</name>
         <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>setTimeZone</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.fmt.SetTimeZoneTag</tag-class>
-    <body-content>empty</body-content>
     <description>
         Stores the given time zone in the time zone configuration variable
     </description>
+    <name>setTimeZone</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetTimeZoneTag</tag-class>
+    <body-content>empty</body-content>
     <attribute>
+        <description>
+The time zone. A String value is interpreted as
+a time zone ID. This may be one of the time zone
+IDs supported by the Java platform (such as
+"America/Los_Angeles") or a custom time zone
+ID (such as "GMT-8"). See java.util.TimeZone for
+more information on supported time zone
+formats.
+        </description>
         <name>value</name>
         <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable which
+stores the time zone of type
+java.util.TimeZone.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope of var or the time zone configuration
+variable.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>bundle</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.fmt.BundleTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
         Loads a resource bundle to be used by its tag body
     </description>
+    <name>bundle</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.BundleTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Resource bundle base name. This is the bundle's
+fully-qualified resource name, which has the same
+form as a fully-qualified class name, that is, it uses
+"." as the package component separator and does not
+have any file type (such as ".class" or ".properties")
+suffix.
+        </description>
         <name>basename</name>
         <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Prefix to be prepended to the value of the message
+key of any nested &lt;fmt:message&gt; action.
+        </description>
         <name>prefix</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>setBundle</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.fmt.SetBundleTag</tag-class>
-    <body-content>empty</body-content>
     <description>
         Loads a resource bundle and stores it in the named scoped variable or
         the bundle configuration variable
     </description>
+    <name>setBundle</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag</tag-class>
+    <body-content>empty</body-content>
     <attribute>
+        <description>
+Resource bundle base name. This is the bundle's
+fully-qualified resource name, which has the same
+form as a fully-qualified class name, that is, it uses
+"." as the package component separator and does not
+have any file type (such as ".class" or ".properties")
+suffix.
+        </description>
         <name>basename</name>
         <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable which stores
+the i18n localization context of type
+javax.servlet.jsp.jstl.fmt.LocalizationC
+ontext.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope of var or the localization context
+configuration variable.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>message</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.fmt.MessageTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
         Maps key to localized message and performs parametric replacement
     </description>
+    <name>message</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.MessageTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Message key to be looked up.
+        </description>
         <name>key</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Localization context in whose resource
+bundle the message key is looked up.
+        </description>
         <name>bundle</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable
+which stores the localized message.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope of var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>param</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.fmt.ParamTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
         Supplies an argument for parametric replacement to a containing
         &lt;message&gt; tag
     </description>
+    <name>param</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParamTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Argument used for parametric replacement.
+        </description>
         <name>value</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>formatNumber</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.fmt.FormatNumberTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
         Formats a numeric value as a number, currency, or percentage
     </description>
+    <name>formatNumber</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatNumberTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Numeric value to be formatted.
+        </description>
         <name>value</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Specifies whether the value is to be
+formatted as number, currency, or
+percentage.
+        </description>
         <name>type</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Custom formatting pattern.
+        </description>
         <name>pattern</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+ISO 4217 currency code. Applied only
+when formatting currencies (i.e. if type is
+equal to "currency"); ignored otherwise.
+        </description>
         <name>currencyCode</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Currency symbol. Applied only when
+formatting currencies (i.e. if type is equal
+to "currency"); ignored otherwise.
+        </description>
         <name>currencySymbol</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Specifies whether the formatted output
+will contain any grouping separators.
+        </description>
         <name>groupingUsed</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Maximum number of digits in the integer
+portion of the formatted output.
+        </description>
         <name>maxIntegerDigits</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Minimum number of digits in the integer
+portion of the formatted output.
+        </description>
         <name>minIntegerDigits</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Maximum number of digits in the
+fractional portion of the formatted output.
+        </description>
         <name>maxFractionDigits</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Minimum number of digits in the
+fractional portion of the formatted output.
+        </description>
         <name>minFractionDigits</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable
+which stores the formatted result as a
+String.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope of var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>parseNumber</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.fmt.ParseNumberTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
         Parses the string representation of a number, currency, or percentage
     </description>
+    <name>parseNumber</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseNumberTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+String to be parsed.
+        </description>
         <name>value</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Specifies whether the string in the value
+attribute should be parsed as a number,
+currency, or percentage.
+        </description>
         <name>type</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Custom formatting pattern that determines
+how the string in the value attribute is to be
+parsed.
+        </description>
         <name>pattern</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Locale whose default formatting pattern (for
+numbers, currencies, or percentages,
+respectively) is to be used during the parse
+operation, or to which the pattern specified
+via the pattern attribute (if present) is
+applied.
+        </description>
         <name>parseLocale</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Specifies whether just the integer portion of
+the given value should be parsed.
+        </description>
         <name>integerOnly</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable which
+stores the parsed result (of type
+java.lang.Number).
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope of var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>formatDate</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.fmt.FormatDateTag</tag-class>
-    <body-content>empty</body-content>
     <description>
         Formats a date and/or time using the supplied styles and pattern
     </description>
+    <name>formatDate</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.FormatDateTag</tag-class>
+    <body-content>empty</body-content>
     <attribute>
+        <description>
+Date and/or time to be formatted.
+        </description>
         <name>value</name>
         <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Specifies whether the time, the date, or both
+the time and date components of the given
+date are to be formatted. 
+        </description>
         <name>type</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Predefined formatting style for dates. Follows
+the semantics defined in class
+java.text.DateFormat. Applied only
+when formatting a date or both a date and
+time (i.e. if type is missing or is equal to
+"date" or "both"); ignored otherwise.
+        </description>
         <name>dateStyle</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Predefined formatting style for times. Follows
+the semantics defined in class
+java.text.DateFormat. Applied only
+when formatting a time or both a date and
+time (i.e. if type is equal to "time" or "both");
+ignored otherwise.
+        </description>
         <name>timeStyle</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Custom formatting style for dates and times.
+        </description>
         <name>pattern</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Time zone in which to represent the formatted
+time.
+        </description>
         <name>timeZone</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable which
+stores the formatted result as a String.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope of var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>parseDate</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.fmt.ParseDateTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
         Parses the string representation of a date and/or time
     </description>
+    <name>parseDate</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.fmt.ParseDateTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Date string to be parsed.
+        </description>
         <name>value</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Specifies whether the date string in the
+value attribute is supposed to contain a
+time, a date, or both.
+        </description>
         <name>type</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Predefined formatting style for days
+which determines how the date
+component of the date string is to be
+parsed. Applied only when formatting a
+date or both a date and time (i.e. if type
+is missing or is equal to "date" or "both");
+ignored otherwise.
+        </description>
         <name>dateStyle</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Predefined formatting styles for times
+which determines how the time
+component in the date string is to be
+parsed. Applied only when formatting a
+time or both a date and time (i.e. if type
+is equal to "time" or "both"); ignored
+otherwise.
+        </description>
         <name>timeStyle</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Custom formatting pattern which
+determines how the date string is to be
+parsed.
+        </description>
         <name>pattern</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Time zone in which to interpret any time
+information in the date string.
+        </description>
         <name>timeZone</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Locale whose predefined formatting styles
+for dates and times are to be used during
+the parse operation, or to which the
+pattern specified via the pattern
+attribute (if present) is applied.
+        </description>
         <name>parseLocale</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable in
+which the parsing result (of type
+java.util.Date) is stored.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope of var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
Index: lams_learning/web/WEB-INF/jstl/tlds/fn.tld
===================================================================
diff -u
--- lams_learning/web/WEB-INF/jstl/tlds/fn.tld	(revision 0)
+++ lams_learning/web/WEB-INF/jstl/tlds/fn.tld	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+  version="2.0">
+    
+  <description>JSTL 1.1 functions library</description>
+  <display-name>JSTL functions</display-name>
+  <tlib-version>1.1</tlib-version>
+  <short-name>fn</short-name>
+  <uri>http://java.sun.com/jsp/jstl/functions</uri>
+
+  <function>
+    <description>
+      Tests if an input string contains the specified substring.
+    </description>
+    <name>contains</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>boolean contains(java.lang.String, java.lang.String)</function-signature>
+    <example>
+      &lt;c:if test="${fn:contains(name, searchString)}">
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Tests if an input string contains the specified substring in a case insensitive way.
+    </description>
+    <name>containsIgnoreCase</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>boolean containsIgnoreCase(java.lang.String, java.lang.String)</function-signature>
+    <example>
+      &lt;c:if test="${fn:containsIgnoreCase(name, searchString)}">
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Tests if an input string ends with the specified suffix.
+    </description>
+    <name>endsWith</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>boolean endsWith(java.lang.String, java.lang.String)</function-signature>
+    <example>
+      &lt;c:if test="${fn:endsWith(filename, ".txt")}">
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Escapes characters that could be interpreted as XML markup.
+    </description>
+    <name>escapeXml</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>java.lang.String escapeXml(java.lang.String)</function-signature>
+    <example>
+      ${fn:escapeXml(param:info)}
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Returns the index withing a string of the first occurrence of a specified substring.
+    </description>
+    <name>indexOf</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>int indexOf(java.lang.String, java.lang.String)</function-signature>
+    <example>
+      ${fn:indexOf(name, "-")}
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Joins all elements of an array into a string.
+    </description>
+    <name>join</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>java.lang.String join(java.lang.String[], java.lang.String)</function-signature>
+    <example>
+      ${fn:join(array, ";")}
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Returns the number of items in a collection, or the number of characters in a string.
+    </description>
+    <name>length</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>int length(java.lang.Object)</function-signature>
+    <example>
+      You have ${fn:length(shoppingCart.products)} in your shopping cart.
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Returns a string resulting from replacing in an input string all occurrences
+      of a "before" string into an "after" substring.
+    </description>
+    <name>replace</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>java.lang.String replace(java.lang.String, java.lang.String, java.lang.String)</function-signature>
+    <example>
+      ${fn:replace(text, "-", "&#149;")}
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Splits a string into an array of substrings.
+    </description>
+    <name>split</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>java.lang.String[] split(java.lang.String, java.lang.String)</function-signature>
+    <example>
+      ${fn:split(customerNames, ";")}
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Tests if an input string starts with the specified prefix.
+    </description>
+    <name>startsWith</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>boolean startsWith(java.lang.String, java.lang.String)</function-signature>
+    <example>
+      &lt;c:if test="${fn:startsWith(product.id, "100-")}">
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Returns a subset of a string.
+    </description>
+    <name>substring</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>java.lang.String substring(java.lang.String, int, int)</function-signature>
+    <example>
+      P.O. Box: ${fn:substring(zip, 6, -1)}
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Returns a subset of a string following a specific substring.
+    </description>
+    <name>substringAfter</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>java.lang.String substringAfter(java.lang.String, java.lang.String)</function-signature>
+    <example>
+      P.O. Box: ${fn:substringAfter(zip, "-")}
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Returns a subset of a string before a specific substring.
+    </description>
+    <name>substringBefore</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>java.lang.String substringBefore(java.lang.String, java.lang.String)</function-signature>
+    <example>
+      Zip (without P.O. Box): ${fn:substringBefore(zip, "-")}
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Converts all of the characters of a string to lower case.
+    </description>
+    <name>toLowerCase</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>java.lang.String toLowerCase(java.lang.String)</function-signature>
+    <example>
+      Product name: ${fn.toLowerCase(product.name)}
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Converts all of the characters of a string to upper case.
+    </description>
+    <name>toUpperCase</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>java.lang.String toUpperCase(java.lang.String)</function-signature>
+    <example>
+      Product name: ${fn.UpperCase(product.name)}
+    </example>
+  </function>
+
+  <function>
+    <description>
+      Removes white spaces from both ends of a string.
+    </description>
+    <name>trim</name>
+    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
+    <function-signature>java.lang.String trim(java.lang.String)</function-signature>
+    <example>
+      Name: ${fn.trim(name)}
+    </example>  
+  </function>
+
+</taglib>
Fisheye: Tag 937a2bbf2f083f7f56308f58ef5a805114a3c760 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/jstl/tlds/sql-rt.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 937a2bbf2f083f7f56308f58ef5a805114a3c760 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/jstl/tlds/sql.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 937a2bbf2f083f7f56308f58ef5a805114a3c760 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/jstl/tlds/x-rt.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/WEB-INF/jstl/tlds/x.tld
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -r937a2bbf2f083f7f56308f58ef5a805114a3c760
--- lams_learning/web/WEB-INF/jstl/tlds/x.tld	(.../x.tld)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/WEB-INF/jstl/tlds/x.tld	(.../x.tld)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
@@ -1,269 +1,444 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib
-  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-  "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
-  <tlib-version>1.0</tlib-version>
-  <jsp-version>1.2</jsp-version>
-  <short-name>x</short-name>
-  <uri>http://java.sun.com/jstl/xml</uri>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+    version="2.0">
+    
+  <description>JSTL 1.1 XML library</description>
   <display-name>JSTL XML</display-name>
-  <description>JSTL 1.0 XML library</description>
+  <tlib-version>1.1</tlib-version>
+  <short-name>x</short-name>
+  <uri>http://java.sun.com/jsp/jstl/xml</uri>
 
   <validator>
+    <description>
+        Provides validation features for JSTL XML tags.
+    </description>
     <validator-class>
 	org.apache.taglibs.standard.tlv.JstlXmlTLV
     </validator-class>
-    <init-param>
-	<param-name>expressionAttributes</param-name>
-	<param-value>
-	    out:escapeXml
-	    parse:xml
-	    parse:systemId
-	    parse:filter
-	    transform:xml
-	    transform:xmlSystemId
-	    transform:xslt
-	    transform:xsltSystemId
-	    transform:result
-	</param-value>
-	<description>
-	    Whitespace-separated list of colon-separated token pairs
-	    describing tag:attribute combinations that accept expressions.
-	    The validator uses this information to determine which
-	    attributes need their syntax validated.
-	</description>
-     </init-param>
   </validator>
 
   <tag>
-    <name>choose</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
         Simple conditional tag that establishes a context for
         mutually exclusive conditional operations, marked by
         &lt;when&gt; and &lt;otherwise&gt;
     </description>
+    <name>choose</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
+    <body-content>JSP</body-content>
   </tag>
 
   <tag>
-    <name>out</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.xml.ExprTag</tag-class>
-    <body-content>empty</body-content>
     <description>
 	Like &lt;%= ... &gt;, but for XPath expressions.
     </description>
+    <name>out</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ExprTag</tag-class>
+    <body-content>empty</body-content>
     <attribute>
+        <description>
+XPath expression to be evaluated.
+        </description>
         <name>select</name>
         <required>true</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Determines whether characters &lt;,&gt;,&amp;,'," in the
+resulting string should be converted to their
+corresponding character entity codes. Default
+value is true.
+        </description>
         <name>escapeXml</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
+    <description>
+        XML conditional tag, which evalutes its body if the
+        supplied XPath expression evalutes to 'true' as a boolean
+    </description>
     <name>if</name>
     <tag-class>org.apache.taglibs.standard.tag.common.xml.IfTag</tag-class>
     <body-content>JSP</body-content>
-    <description>
-      XML conditional tag, which evalutes its body if the
-      supplied XPath expression evalutes to 'true' as a boolean
-    </description>
     <attribute>
+        <description>
+The test condition that tells whether or not the
+body content should be processed.
+        </description>
         <name>select</name>
         <required>true</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable for the
+resulting value of the test condition. The type
+of the scoped variable is Boolean.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope for var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>forEach</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.xml.ForEachTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
 	XML iteration tag.
     </description>
+    <name>forEach</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.xml.ForEachTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Name of the exported scoped variable for the
+current item of the iteration. This scoped variable
+has nested visibility. Its type depends on the
+result of the XPath expression in the select
+attribute.
+        </description>
 	<name>var</name>
 	<required>false</required>
 	<rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+XPath expression to be evaluated.
+        </description>
 	<name>select</name>
 	<required>true</required>
 	<rtexprvalue>false</rtexprvalue>
     </attribute>
+    <attribute>
+        <description>
+Iteration begins at the item located at the
+specified index. First item of the collection has
+index 0.
+        </description>
+	<name>begin</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration ends at the item located at the specified
+index (inclusive).
+        </description>
+	<name>end</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Iteration will only process every step items of
+the collection, starting with the first one.
+        </description>
+	<name>step</name>
+	<required>false</required>
+	<rtexprvalue>true</rtexprvalue>
+	<type>int</type>
+    </attribute>
+    <attribute>
+        <description>
+Name of the exported scoped variable for the
+status of the iteration. Object exported is of type
+javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+        </description>
+	<name>varStatus</name>
+	<required>false</required>
+	<rtexprvalue>false</rtexprvalue>
+    </attribute>
   </tag>
 
   <tag>
-    <name>otherwise</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
 	Subtag of &lt;choose&gt; that follows &lt;when&gt; tags
 	and runs only if all of the prior conditions evaluated to
 	'false'
     </description>
+    <name>otherwise</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
+    <body-content>JSP</body-content>
   </tag>
 
   <tag>
-    <name>param</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.xml.ParamTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
         Adds a parameter to a containing 'transform' tag's Transformer
     </description>
+    <name>param</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParamTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Name of the transformation parameter.
+        </description>
         <name>name</name>
         <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Value of the parameter.
+        </description>
         <name>value</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>parse</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.xml.ParseTag</tag-class>
-    <tei-class>org.apache.taglibs.standard.tei.XmlParseTEI</tei-class>
-    <body-content>JSP</body-content>
     <description>
 	Parses XML content from 'source' attribute or 'body'
     </description>
+    <name>parse</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParseTag</tag-class>
+    <tei-class>org.apache.taglibs.standard.tei.XmlParseTEI</tei-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Name of the exported scoped variable for
+the parsed XML document. The type of the
+scoped variable is implementation
+dependent.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Name of the exported scoped variable for
+the parsed XML document. The type of the
+scoped variable is
+org.w3c.dom.Document.
+        </description>
         <name>varDom</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope for var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope for varDom.
+        </description>
         <name>scopeDom</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Deprecated. Use attribute 'doc' instead.
+        </description>
         <name>xml</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Source XML document to be parsed.
+        </description>
+        <name>doc</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+The system identifier (URI) for parsing the
+XML document.
+        </description>
         <name>systemId</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Filter to be applied to the source
+document.
+        </description>
         <name>filter</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>set</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.xml.SetTag</tag-class>
-    <body-content>empty</body-content>
     <description>
 	Saves the result of an XPath expression evaluation in a 'scope'
     </description>
+    <name>set</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.xml.SetTag</tag-class>
+    <body-content>empty</body-content>
     <attribute>
+        <description>
+Name of the exported scoped variable to hold
+the value specified in the action. The type of the
+scoped variable is whatever type the select
+expression evaluates to.
+        </description>
         <name>var</name>
         <required>true</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+XPath expression to be evaluated.
+        </description>
 	<name>select</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope for var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>transform</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.xml.TransformTag</tag-class>
-    <tei-class>org.apache.taglibs.standard.tei.XmlTransformTEI</tei-class>
-    <body-content>JSP</body-content>
     <description>
 	Conducts a transformation given a source XML document
 	and an XSLT stylesheet
     </description>
+    <name>transform</name>
+    <tag-class>org.apache.taglibs.standard.tag.rt.xml.TransformTag</tag-class>
+    <tei-class>org.apache.taglibs.standard.tei.XmlTransformTEI</tei-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+Name of the exported
+scoped variable for the
+transformed XML
+document. The type of the
+scoped variable is
+org.w3c.dom.Document.
+        </description>
         <name>var</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Scope for var.
+        </description>
         <name>scope</name>
         <required>false</required>
         <rtexprvalue>false</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Result
+Object that captures or
+processes the transformation
+result.
+        </description>
         <name>result</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Deprecated. Use attribute
+'doc' instead.
+        </description>
         <name>xml</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+Source XML document to be
+transformed. (If exported by
+&lt;x:set&gt;, it must correspond
+to a well-formed XML
+document, not a partial
+document.)
+        </description>
+        <name>doc</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+Deprecated. Use attribute
+'docSystemId' instead.
+        </description>
         <name>xmlSystemId</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+The system identifier (URI)
+for parsing the XML
+document.
+        </description>
+        <name>docSystemId</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <description>
+javax.xml.transform.Source
+Transformation stylesheet as
+a String, Reader, or
+Source object.
+        </description>
 	<name>xslt</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
     <attribute>
+        <description>
+The system identifier (URI)
+for parsing the XSLT
+stylesheet.
+        </description>
 	<name>xsltSystemId</name>
         <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
+        <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
 
   <tag>
-    <name>when</name>
-    <tag-class>org.apache.taglibs.standard.tag.common.xml.WhenTag</tag-class>
-    <body-content>JSP</body-content>
     <description>
         Subtag of &lt;choose&gt; that includes its body if its
         expression evalutes to 'true'
     </description>
+    <name>when</name>
+    <tag-class>org.apache.taglibs.standard.tag.common.xml.WhenTag</tag-class>
+    <body-content>JSP</body-content>
     <attribute>
+        <description>
+The test condition that tells whether or
+not the body content should be
+processed
+        </description>
         <name>select</name>
         <required>true</required>
         <rtexprvalue>false</rtexprvalue>
Fisheye: Tag 937a2bbf2f083f7f56308f58ef5a805114a3c760 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/struts/tlds/struts-bean-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 937a2bbf2f083f7f56308f58ef5a805114a3c760 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/struts/tlds/struts-html-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 937a2bbf2f083f7f56308f58ef5a805114a3c760 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/struts/tlds/struts-logic-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -ra068098703ce1ee36cc9e8dcf92165ab5c1be2e7 -r937a2bbf2f083f7f56308f58ef5a805114a3c760
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision a068098703ce1ee36cc9e8dcf92165ab5c1be2e7)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app >
+<web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
  <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
@@ -90,6 +88,13 @@
          </filter-class>
 </filter>
 
+<filter>
+       <filter-name>LocaleFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.filter.LocaleFilter
+         </filter-class>
+</filter>
+
   <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
@@ -124,6 +129,11 @@
      <url-pattern>/*</url-pattern>
 </filter-mapping>
 
+  <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+</filter-mapping>
+
     <!--
     To use non XDoclet listeners, create a listeners.xml file that
     contains the additional listeners and place it in your
@@ -179,21 +189,21 @@
 </servlet>
 
 <servlet>
-		<servlet-name>exportPortfolio</servlet-name>
-		<display-name>Export Portfolio</display-name>
 		<description>Export Portfolio</description>		
+		<display-name>Export Portfolio</display-name>
+		<servlet-name>exportPortfolio</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.MainExportServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>exportDownload</servlet-name>
-		<display-name>Export Portfolio Download</display-name>
 		<description>Export Portfolio Download Page</description>		
+		<display-name>Export Portfolio Download</display-name>
+		<servlet-name>exportDownload</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.ExportDownloadServlet</servlet-class>
 	</servlet>
 	<servlet>
-		<servlet-name>exportNotSupported</servlet-name>
-		<display-name>Export Portfolio Unavailable</display-name>
 		<description>Tool does not support portfolio exports</description>
+		<display-name>Export Portfolio Unavailable</display-name>
+		<servlet-name>exportNotSupported</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.ExportNotSupportedServlet</servlet-class>
 	</servlet>
 
@@ -254,99 +264,61 @@
 	<location>/403.html</location>
 </error-page>  
 
-  <!--
-	Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-	USA
-	http://www.gnu.org/licenses/gpl.txt
--->
+  	<jsp-config>
+		<!--  ======================================================== -->	
+		<!-- Struts Tag Library Descriptors -->
+		<!--  ======================================================== -->	
+		<taglib>
+		    <taglib-uri>tags-bean</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
+		</taglib>
+		<taglib>
+		    <taglib-uri>tags-html</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
+		</taglib>
+		<taglib>
+		    <taglib-uri>tags-logic</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
+		</taglib>
+		<taglib>
+		    <taglib-uri>tags-tiles</taglib-uri>
+		    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
+		</taglib>
+		<!--  ======================================================== -->	
+		<!--  JSTL 1.2 Tag Library 									   -->
+		<!--  ======================================================== -->	
+		  <taglib>
+		    <taglib-uri>tags-fmt</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
+		  </taglib>
+		  <taglib>
+		    <taglib-uri>tags-core</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
+		  </taglib>
+		  <taglib>
+		    <taglib-uri>tags-function</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/fn.tld</taglib-location>
+		  </taglib>
+		  <taglib>
+		    <taglib-uri>tags-xml</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
+		  </taglib>
+		<!--  ======================================================== -->	
+		<!--   Customized Tag Library -->
+		<!--  ======================================================== -->	
+		<taglib>
+		    <taglib-uri>fck-editor</taglib-uri>
+		    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
+		</taglib>
+		<!--  ======================================================== -->	
+		<!--   LAMS Tag Library -->
+		<!--  ======================================================== -->	
+		<taglib>
+		   <taglib-uri>tags-lams</taglib-uri>
+		   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+		</taglib>
+	</jsp-config>
 
-<!-- Struts Tag Library Defintions -->
-<taglib>
-	<taglib-uri>tags-bean</taglib-uri>
-	<taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-html</taglib-uri>
-	<taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-logic</taglib-uri>
-	<taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-tiles</taglib-uri>
-	<taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-bean-el</taglib-uri>
-	<taglib-location>
-		/WEB-INF/struts/tlds/struts-bean-el.tld
-	</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-html-el</taglib-uri>
-	<taglib-location>
-		/WEB-INF/struts/tlds/struts-html-el.tld
-	</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-logic-el</taglib-uri>
-	<taglib-location>
-		/WEB-INF/struts/tlds/struts-logic-el.tld
-	</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-tiles-el</taglib-uri>
-	<taglib-location>
-		/WEB-INF/struts/tlds/struts-tiles-el.tld
-	</taglib-location>
-</taglib>
-
-<!-- JSTL Tag Library Defintions -->
-<taglib>
-	<taglib-uri>tags-fmt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-fmt-rt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/tlds/fmt-rt.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-core</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-core-rt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/tlds/c-rt.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-xml</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/tlds/x.tld</taglib-location>
-</taglib>
-<taglib>
-	<taglib-uri>tags-xml_rt</taglib-uri>
-	<taglib-location>/WEB-INF/jstl/tlds/x-rt.tld</taglib-location>
-</taglib>
-
-<!--  ======================================================== -->	
-<!--   LAMS Tag Library -->
-<!--  ======================================================== -->	
-<taglib>
-   <taglib-uri>tags-lams</taglib-uri>
-   <taglib-location>/WEB-INF/lams.tld</taglib-location>
-</taglib>
-
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
@@ -380,6 +352,7 @@
 		<realm-name>LAMS</realm-name>
    		<form-login-config>
     		<form-login-page>/login.jsp</form-login-page>
+    		<form-error-page>/login.jsp</form-error-page>
    		</form-login-config>
    	</login-config>
 
Index: lams_learning/web/error.jsp
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -r937a2bbf2f083f7f56308f58ef5a805114a3c760
--- lams_learning/web/error.jsp	(.../error.jsp)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/error.jsp	(.../error.jsp)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
@@ -19,7 +19,7 @@
   http://www.gnu.org/licenses/gpl.txt 
 -->
 
-<%@ taglib uri="tags-html-el" prefix="html-el" %>
+<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ page import="org.apache.struts.action.Action" %>
@@ -40,9 +40,9 @@
 		<img src="<%=pathToShare%>/images/error.jpg" alt="Error occured"/>
 	</td>
 	<td width="90%" valign="middle" class="body" colspan="2">
-		 <html-el:messages id="error" message="false"> 
+		 <html:messages id="error" message="false"> 
 			 <c:out value="${error}" escapeXml="false"/><BR>
-		 </html-el:messages> 
+		 </html:messages> 
 	</td>
 </tr>
 </logic:messagesPresent>
Index: lams_learning/web/grouping/grouping.jsp
===================================================================
diff -u -r7492a142f40382aa48f48eae31caa05856e39858 -r937a2bbf2f083f7f56308f58ef5a805114a3c760
--- lams_learning/web/grouping/grouping.jsp	(.../grouping.jsp)	(revision 7492a142f40382aa48f48eae31caa05856e39858)
+++ lams_learning/web/grouping/grouping.jsp	(.../grouping.jsp)	(revision 937a2bbf2f083f7f56308f58ef5a805114a3c760)
@@ -19,15 +19,15 @@
 http://www.gnu.org/licenses/gpl.txt
 -->
 
-<%@ taglib uri="tags-html-el" prefix="html-el" %>
-<%@ taglib uri="tags-bean-el" prefix="bean-el" %>
-<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-core" prefix="c" %>		
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <div align="center">
 
-	<html-el:form action="/grouping.do?method=completeActivity&userId=${user.userId}&lessonId=${lesson.lessonId}&activityId=${activityId}" target="_self">
+	<html:form action="/grouping.do?method=completeActivity&userId=${user.userId}&lessonId=${lesson.lessonId}&activityId=${activityId}" target="_self">
 
 		<span class="error">
 			<%-- Struts error messages --%>
@@ -47,7 +47,7 @@
 					</table>
 				</td>
 			</tr>
-			<logic-el:iterate id="group" name="groups" indexId="gId"> 
+			<logic:iterate id="group" name="groups" indexId="gId"> 
 			<tr>
 				<td align="right" class="bodyBold" style="{border-right: solid #CCCCCC 1px; border-bottom: solid #CCCCCC 1px; }">
 					Group <c:out value="${gId+1}"/>
@@ -65,15 +65,15 @@
 					</table>		
 				</td>
 			</tr>
-			</logic-el:iterate>
+			</logic:iterate>
 			<tr> 
 				<td align="right" valign="top" class="bodyBold">&nbsp;</td>
 				<td align="right">
-					<html-el:submit styleClass="button" value="Finished" onmouseover="pviiClassNew(this,'buttonover')" onmouseout="pviiClassNew(this,'button')"/> 
+					<html:submit styleClass="button" value="Finished" onmouseover="pviiClassNew(this,'buttonover')" onmouseout="pviiClassNew(this,'button')"/> 
 				</td>
 			</tr>
 		</table>
 
-	</html-el:form>
+	</html:form>
 
 </div>
\ No newline at end of file