Index: lams_contentrepository/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/web/WEB-INF/Attic/web.xml,v
diff -u -r1.6 -r1.7
--- lams_contentrepository/web/WEB-INF/web.xml	30 Nov 2005 02:34:30 -0000	1.6
+++ lams_contentrepository/web/WEB-INF/web.xml	24 Feb 2006 11:43:18 -0000	1.7
@@ -1,42 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  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 
--->
-
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-	<context-param>
+<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">
+ 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
 			classpath:/org/lamsfoundation/lams/applicationContext.xml
 			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 		</param-value>
 	</context-param>
-	<listener>
+
+    <!--
+    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.
+    -->
+
+  	<listener>
 		<listener-class>
 			org.springframework.web.context.ContextLoaderListener
 		</listener-class>
 	</listener>	
 
-   <servlet>
+    <servlet>
       <servlet-name>action</servlet-name>
       <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
       <init-param>
@@ -53,36 +46,117 @@
       </init-param>
       <load-on-startup>0</load-on-startup>
    </servlet>
+
+	<!--  the download servlet contains the link to the repository for -->
+	<!--  all other servlets (including the struts one) so it must be -->
+	<!--  loaded on startup, to create the context and get the repository -->
+	  <servlet>
+	    <description>Download file(s)</description>
+	    <display-name>Download file</display-name>
+	    <servlet-name>Download</servlet-name>
+	    <servlet-class>org.lamsfoundation.lams.contentrepository.struts.action.Download</servlet-class>
+	      <load-on-startup>1</load-on-startup>
+	  </servlet>
+
+	 <servlet>
+	    <description>Test Login</description>
+	    <display-name>Test Login</display-name>
+	    <servlet-name>TestLogin</servlet-name>
+	    <servlet-class>org.lamsfoundation.lams.contentrepository.struts.action.TestLogin</servlet-class>
+	  </servlet>
+
    <servlet-mapping>
       <servlet-name>action</servlet-name>
       <url-pattern>*.do</url-pattern>
    </servlet-mapping>
 
-	<!--  the download servlet contains the link to the repository for -->
-	<!--  all other servlets (including the struts one) so it must be -->
-	<!--  loaded on startup, to create the context and get the repository -->
-  <servlet>
-    <description>Download file(s)</description>
-    <display-name>Download file</display-name>
-    <servlet-name>Download</servlet-name>
-    <servlet-class>org.lamsfoundation.lams.contentrepository.struts.action.Download</servlet-class>
-      <load-on-startup>1</load-on-startup>
-  </servlet>
   <servlet-mapping>
     <servlet-name>Download</servlet-name>
     <url-pattern>/download/*</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <description>Test Login</description>
-    <display-name>Test Login</display-name>
+   <servlet-mapping>
     <servlet-name>TestLogin</servlet-name>
-    <servlet-class>org.lamsfoundation.lams.contentrepository.struts.action.TestLogin</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>TestLogin</servlet-name>
     <url-pattern>/testlogin</url-pattern>
   </servlet-mapping>
 
-</web-app>
+   <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)>
+   -->
+
+  	<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>
+	</jsp-config>
+
+   <!--
+   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>