Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r9cf6f80b33044116d7378e7eb384f771ac486a6b -rccd319d5814f7182b441e35cd615aa162fef83fb
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cf6f80b33044116d7378e7eb384f771ac486a6b)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision ccd319d5814f7182b441e35cd615aa162fef83fb)
@@ -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)
 
@@ -55,15 +53,25 @@
 		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
+	<filter>
+		<filter-name>LocaleFilter</filter-name>
+	         <filter-class>
+			   org.lamsfoundation.lams.web.filter.LocaleFilter
+	         </filter-class>
+	</filter>
 
     <filter-mapping>
     <filter-name>SystemSessionFilter</filter-name>
      <url-pattern>/*</url-pattern> 
   </filter-mapping>
-    <filter-mapping>
+   <filter-mapping>
     <filter-name>hibernateFilter</filter-name>
      <url-pattern>/*</url-pattern>
   </filter-mapping>
+  <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+   </filter-mapping>
 
   <listener>
 	<listener-class>
@@ -269,88 +277,71 @@
    <!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>
 
-<taglib>
-    <taglib-uri>tags-html</taglib-uri>
-    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-</taglib>
+		<!--  ======================================================== -->	
+		<!-- 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>
+		<!--  ======================================================== -->	
+		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+		<!--  ======================================================== -->	
+		  <taglib>
+		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
+		  </taglib>
+		  <taglib>
+		    <taglib-uri>tags-scriptfree</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.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>
+		 <taglib>
+		   <taglib-uri>tags-lams</taglib-uri>
+		   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+		</taglib>
 
-<taglib>
-    <taglib-uri>tags-logic</taglib-uri>
-    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-</taglib>
+	</jsp-config>
 
-<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>
-
- <taglib>
-   <taglib-uri>tags-lams</taglib-uri>
-   <taglib-location>/WEB-INF/lams.tld</taglib-location>
-</taglib>
-
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>