Index: lams_admin/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/Attic/web.xml,v
diff -u -r1.5 -r1.6
--- lams_admin/web/WEB-INF/web.xml	21 Feb 2006 08:24:35 -0000	1.5
+++ lams_admin/web/WEB-INF/web.xml	24 Feb 2006 08:08:43 -0000	1.6
@@ -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">
  <display-name>LAMS</display-name>
 
 <description>Learning Activity Management System</description>
@@ -111,10 +109,12 @@
 	<listener-class>
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
+</listener>	
+<listener>
 	<listener-class>
  		org.lamsfoundation.lams.web.SessionListener
  	</listener-class>
-</listener>	
+</listener>
 
  <servlet>
 	<servlet-name>context</servlet-name>
@@ -167,91 +167,61 @@
    <!ELEMENT error-page ((error-code | exception-type), location)>
    -->
 
-<!--  ======================================================== -->	
-<!-- Struts Tag Library Descriptors -->
-<!--  ======================================================== -->	
-<taglib>
-    <taglib-uri>tags-bean</taglib-uri>
-    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-</taglib>
+  	<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>
 
-<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>
-
-<taglib>
-    <taglib-uri>tags-c</taglib-uri>
-    <taglib-location>/WEB-INF/struts/tlds/c.tld</taglib-location>
-</taglib>
-<!--  ======================================================== -->	
-<!--  JSTL Tag Library -->
-<!--  ======================================================== -->	
-  <taglib>
-    <taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
-    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>http://java.sun.com/jstl/fmt-rt</taglib-uri>
-    <taglib-location>/WEB-INF/jstl/tlds/fmt-rt.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
-    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>http://java.sun.com/jstl/core-rt</taglib-uri>
-    <taglib-location>/WEB-INF/jstl/tlds/c-rt.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>
-
    <!--
    To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
    Organize web-security.xml following this DTD slice: