Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -r7eaa24de10b2151186a637b21fa02e396fa09f1a
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision c47073639465a5a05b59d8e975d5274e881a908a)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 7eaa24de10b2151186a637b21fa02e396fa09f1a)
@@ -1,26 +1,170 @@
 <?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>
-   <servlet>
-      <servlet-name>action</servlet-name>
-      <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-      <init-param>
-         <param-name>config</param-name>
-         <param-value>/WEB-INF/struts/struts-config.xml</param-value>
-      </init-param>
-      <init-param>
-         <param-name>debug</param-name>
-         <param-value>3</param-value>
-      </init-param>
-      <init-param>
-         <param-name>detail</param-name>
-         <param-value>3</param-value>
-      </init-param>
-      <load-on-startup>0</load-on-startup>
-   </servlet>
-   <servlet-mapping>
-      <servlet-name>action</servlet-name>
-      <url-pattern>*.do</url-pattern>
-   </servlet-mapping>
-</web-app>
 
+<web-app >
+
+    <!--
+    To use non XDoclet filters, create a filters.xml file that
+    contains the additional filters (eg Sitemesh) and place it in your
+    project's merge dir.  Don't include filter-mappings in this file,
+    include them in a file called filter-mappings.xml and put that in
+    the same directory.
+    -->
+
+    <!--
+    To use non XDoclet filter-mappings, create a filter-mappings.xml file that
+    contains the additional filter-mappings and place it in your
+    project's merge dir.
+    -->
+
+    <!--
+    To use non XDoclet listeners, create a listeners.xml file that
+    contains the additional listeners and place it in your
+    project's merge dir.
+    -->
+
+     	<!--
+	  - Loads the root application context of this web app at startup,
+	  - by default from "/WEB-INF/applicationContext.xml".
+		- Note that it is preferable to use ContextLoaderListener in a servlet container
+		- that follows the Servlet 2.4 initialization order (most Servlet 2.3 containers do).
+		-
+	  - Use WebApplicationContextUtils.getWebApplicationContext(servletContext)
+	  - to access it anywhere in the web application, outside of the framework.
+	  -
+	  - The root context is the parent of all servlet-specific contexts.
+	  - This means that its beans are automatically available in these child contexts,
+	  - both for getBean(name) calls and (external) bean references.
+		-->
+	<!-- servlet>
+		<servlet-name>context</servlet-name>
+		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet-->
+	<servlet>
+	    <servlet-name>action</servlet-name>
+	    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+	    <init-param>
+	      <param-name>config</param-name>
+	      <param-value>/WEB-INF/struts/struts-config.xml</param-value>
+	    </init-param>
+	    <init-param>
+	      <param-name>debug</param-name>
+	      <param-value>999</param-value>
+	    </init-param>
+	    <init-param>
+	      <param-name>detail</param-name>
+	      <param-value>2</param-value>
+	    </init-param>
+	    <init-param>
+	      <param-name>validate</param-name>
+	      <param-value>true</param-value>
+	    </init-param>
+	    <load-on-startup>2</load-on-startup>
+    </servlet>
+
+  	<servlet-mapping>
+		<servlet-name>action</servlet-name>
+	    <url-pattern>*.do</url-pattern>
+	</servlet-mapping>
+
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
+
+   <!--
+   To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
+   Organize mime-mappings.xml following this DTD slice:
+
+   <!ELEMENT mime-mapping (extension, mime-type)>
+   -->
+
+   <!--
+   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
+   Organize error-pages.xml following this DTD slice:
+
+   <!ELEMENT error-page ((error-code | exception-type), location)>
+   -->
+
+<!-- Struts Tag Library Defintions -->
+<taglib>
+	<taglib-uri>http://jakarta.apache.org/struts/struts-bean</taglib-uri>
+	<taglib-location>/WEB-INF/struts/struts-bean.tld</taglib-location>
+</taglib>
+<taglib>
+	<taglib-uri>http://jakarta.apache.org/struts/struts-bean-el</taglib-uri>
+	<taglib-location>/WEB-INF/struts/struts-bean-el.tld</taglib-location>
+</taglib>
+<taglib>
+	<taglib-uri>http://jakarta.apache.org/struts/struts-html</taglib-uri>
+	<taglib-location>/WEB-INF/struts/struts-html.tld</taglib-location>
+</taglib>
+<taglib>
+	<taglib-uri>http://jakarta.apache.org/struts/struts-html-el</taglib-uri>
+	<taglib-location>/WEB-INF/struts/struts-html-el.tld</taglib-location>
+</taglib>
+<taglib>
+	<taglib-uri>http://jakarta.apache.org/struts/struts-logic</taglib-uri>
+	<taglib-location>/WEB-INF/struts/struts-logic.tld</taglib-location>
+</taglib>
+<taglib>
+	<taglib-uri>http://jakarta.apache.org/struts/struts-logic-el</taglib-uri>
+	<taglib-location>/WEB-INF/struts/struts-logic-el.tld</taglib-location>
+</taglib>
+<taglib>
+	<taglib-uri>http://jakarta.apache.org/struts/struts-template</taglib-uri>
+	<taglib-location>/WEB-INF/struts/struts-template.tld</taglib-location>
+</taglib>
+<taglib>
+	<taglib-uri>http://jakarta.apache.org/struts/struts-tiles</taglib-uri>
+	<taglib-location>/WEB-INF/struts/struts-tiles.tld</taglib-location>
+</taglib>
+
+<!-- JSTL Tag Library Defintions -->
+<taglib>
+	<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
+	<taglib-location>/WEB-INF/jstl/c.tld</taglib-location>
+</taglib>
+<taglib>
+	<taglib-uri>http://java.sun.com/jstl/core_rt</taglib-uri>
+	<taglib-location>/WEB-INF/jstl/c-rt.tld</taglib-location>
+</taglib>
+<taglib>
+	<taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
+	<taglib-location>/WEB-INF/jstl/fmt.tld</taglib-location>
+</taglib>
+<taglib>
+	<taglib-uri>http://java.sun.com/jstl/fmt_rt</taglib-uri>
+	<taglib-location>/WEB-INF/jstl/fmt-rt.tld</taglib-location>
+</taglib>
+<taglib>
+	<taglib-uri>http://java.sun.com/jstl/xml</taglib-uri>
+	<taglib-location>/WEB-INF/jstl/x.tld</taglib-location>
+</taglib>
+<taglib>
+	<taglib-uri>http://java.sun.com/jstl/xml_rt</taglib-uri>
+	<taglib-location>/WEB-INF/jstl/x-rt.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:
+
+   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
+   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
+   <!ELEMENT web-resource-name (#PCDATA)>
+   <!ELEMENT url-pattern (#PCDATA)>
+   <!ELEMENT http-method (#PCDATA)>
+   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
+   <!ELEMENT transport-guarantee (#PCDATA)>
+
+   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
+   <!ELEMENT auth-method (#PCDATA)>
+   <!ELEMENT realm-name (#PCDATA)>
+   <!ELEMENT form-login-config (form-login-page, form-error-page)>
+   <!ELEMENT form-login-page (#PCDATA)>
+   <!ELEMENT form-error-page (#PCDATA)>
+   -->
+
+</web-app>