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>