Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r6c5caa649b8babd008c79ed43739a558d18f4576 -r84af64052b65a5a8f91e42f58f03e8362c5eb3de
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 6c5caa649b8babd008c79ed43739a558d18f4576)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
@@ -1,33 +1,114 @@
 <?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 >
+ <!--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
-	<!--
-		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>
+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.
 
-	<description>Learning Activity 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>
+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.
 
-<!--  FCKEditor Configurations-->
+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
 
-<!--  File browser connector configuration -->
+http://www.gnu.org/licenses/gpl.txt
+-->
+<context-param>
+	<param-name>contextConfigLocation</param-name>
+	<param-value>
+				classpath:/org/lamsfoundation/lams/applicationContext.xml
+				classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
+				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
+				classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
+				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
+	</param-value>
+</context-param>
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</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.
+    -->
+
+    <!--
+    To use non XDoclet listeners, create a listeners.xml file that
+    contains the additional listeners and place it in your
+    project's merge dir.
+    -->
+
+ <!--
+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
+-->
+
 <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>1</load-on-startup>
+</servlet>
+
+<servlet>
 		<servlet-name>Connector</servlet-name>
 		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
@@ -41,141 +122,150 @@
 		<load-on-startup>1</load-on-startup>
 </servlet>
 
-<!--  Quick uploader Configuration -->
-<servlet>
-        <servlet-name>SimpleUploader</servlet-name>
-        <servlet-class>com.fredck.FCKeditor.uploader.SimpleUploaderServlet</servlet-class>
-        <init-param>
-                <param-name>baseDir</param-name>
-                <param-value>/UserFiles/</param-value>
-        </init-param>
-        <init-param>
-                <param-name>debug</param-name>
-                <param-value>true</param-value>
-        </init-param>
-        <init-param>
-                <param-name>enabled</param-name>
-                <param-value>false</param-value>
-        </init-param>
-        <init-param>
-                <param-name>AllowedExtensionsFile</param-name>
-                <param-value></param-value>
-        </init-param>
-        <init-param>
-                <param-name>DeniedExtensionsFile</param-name>
-                <param-value>php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cgi</param-value>
-        </init-param>
-        <init-param>
-                <param-name>AllowedExtensionsImage</param-name>
-                <param-value>jpg|gif|jpeg|png|bmp</param-value>
-        </init-param>
-        <init-param>
-                <param-name>DeniedExtensionsImage</param-name>
-                <param-value></param-value>
-        </init-param>
-        <init-param>
-                <param-name>AllowedExtensionsFlash</param-name>
-                <param-value>swf|fla</param-value>
-        </init-param>
-        <init-param>
-                <param-name>DeniedExtensionsFlash</param-name>
-                <param-value></param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-</servlet>
+  <!--
+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
+-->
+
 <servlet-mapping>
-        <servlet-name>Connector</servlet-name>
-        <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-	  <servlet-name>SimpleUploader</servlet-name>
-	  <url-pattern>/fckeditor/editor/filemanager/upload/simpleuploader</url-pattern>
-	</servlet-mapping>
+	<servlet-name>action</servlet-name>
+    <url-pattern>*.do</url-pattern>
+</servlet-mapping>
 
-<!--  End of FCKEditor Configurations -->
+<servlet-mapping>
+    <servlet-name>Connector</servlet-name>
+    <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+</servlet-mapping>
 
-	<!-- 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>
-	
+   <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 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>
+
+<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>
+
+   <!--
+   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>