Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r0e43e21301c93315b5e7959c30e892f93411787f
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
@@ -1,241 +1,79 @@
 <?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 >
+   <distributable/>
 
-	<!--
-		To use non XDoclet filters, create a filters.xml file that
-		contains the additional filters (eg Sitemesh) and place it in your
-		projects 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.
-	-->
-	
-	<display-name>LAMS</display-name>
+    <!--
+    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.
+    -->
 
-	<description>Learning Acitivity Management System</description>
-	
-	<!--
-	  - Location of the Log4J config file, for initialization and refresh checks.
-	  - Applied by Log4jConfigListener.
-	-->
-	<context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/log4j.xml</param-value>
-	</context-param>
+    <!--
+    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.
+    -->
 
-	<!--
-	  - Location of the XML file that defines the root application context.
-	  - Applied by ContextLoaderServlet.
-	-->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/applicationContext.xml
-		</param-value>
-	</context-param>
+    <!--
+    To use non XDoclet listeners, create a listeners.xml file that
+    contains the additional listeners and place it in your
+    project's merge dir.
+    -->
 
-   <listener>
-      <listener-class>org.lamsfoundation.lams.web.SessionListener</listener-class>
-   </listener>
+  <!--
+  To use non XDoclet servlets, create a servlets.xml file that
+  contains the additional servlets (eg Struts) and place it in your
+  project's merge dir.  Don't include servlet-mappings in this file,
+  include them in a file called servlet-mappings.xml and put that in
+  the same directory.
+  -->
 
-	<!--
-	  - 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>
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
 
-	<!--
-	  - Struts servlet that dispatches requests to registered actions.
-		- Reads its configuration from "struts-config.xml".
-		-
-		- A web app can just contain one such servlet.
-		- If you need multiple namespaces, use Struts' module mechanism.
-    -->
-	<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>
-		<servlet-name>webauthservlet</servlet-name>
-		<servlet-class>
-			org.lamsfoundation.lams.admin.security.WebAuthServlet
-		</servlet-class>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
+   <!--
+   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)>
+   -->
 
-	<!--
-		- Dispatcher servlet mapping for the main web user interface.
-	-->
-	<servlet-mapping>
-		<servlet-name>action</servlet-name>
-		<url-pattern>*.do</url-pattern>
-	</servlet-mapping>
+   <!--
+   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:
 
-	<servlet-mapping>
-		<servlet-name>webauthservlet</servlet-name>
-		<url-pattern>/webauth</url-pattern>
-	</servlet-mapping>
+   <!ELEMENT error-page ((error-code | exception-type), location)>
+   -->
 
-	<session-config>
-		<session-timeout>3600</session-timeout>
-	</session-config>
-	
-	<mime-mapping>
-		<extension>csv</extension>
-		<mime-type>text/plain</mime-type>
-	</mime-mapping>
-	
-	<mime-mapping>
-		<extension>pdf</extension>
-		<mime-type>application/pdf</mime-type>
-	</mime-mapping>
+  <!--
+  To add taglibs by xml, create a file called taglibs.xml and place it
+  in your merge dir.
+  -->
 
-	<!--
-		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)>
-	-->
+   <!--
+   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:
 
-	<!-- Struts Tag Library Defintions -->
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-bean.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-html.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-logic.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-tiles.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-tiles.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-bean-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-bean-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-logic-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-logic-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-html-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-html-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-tiles-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-tiles-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-nested.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-nested.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>
-	
-	<!--Tomcat security config-->
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>Secure Content</web-resource-name>
-			<url-pattern>*.jsp</url-pattern>
-			<url-pattern>*.html</url-pattern>
-		</web-resource-collection>
+   <!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)>
 
-		<auth-constraint>
-			<role-name>*</role-name>
-		</auth-constraint>
+   <!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)>
+   -->
 
-	</security-constraint>
-	
-	<login-config>
-		<auth-method>FORM</auth-method>
-		<realm-name>lams</realm-name>
-		<form-login-config>
-			<form-login-page>/login.jsp</form-login-page>
-			<form-error-page>/login.jsp?failed=y</form-error-page>
-		</form-login-config>
-	</login-config>
-
 </web-app>