Index: lams_monitoring/test/web/WEB-INF/web.xml
===================================================================
diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -rfc085e0eda6c46d659c5b98f9ee9e29f495af042
--- lams_monitoring/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
+++ lams_monitoring/test/web/WEB-INF/web.xml	(.../web.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
@@ -1,30 +1,7 @@
 <?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 >
- <!--
-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
--->
-
-<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>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.monitoring.MonitoringResources</param-value>
 </context-param>
@@ -34,35 +11,35 @@
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml        					  
+		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
-		classpath*:applicationContext.xml
+		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
+<!-- 		classpath:/org/lamsfoundation/lams/tool/imscp/applicationContext.xml  -->
+		classpath:/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
+<!-- 		classpath:/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml -->
+<!-- 		classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml -->
 	</param-value>
 </context-param>
 
-  <!--
-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
--->
-
+  <filter>
+       <filter-name>SystemSessionFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.session.SystemSessionFilter
+         </filter-class>
+</filter>
 <filter>
+       <filter-name>LocaleFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.filter.LocaleFilter
+         </filter-class>
+</filter>
+<filter>
 	<filter-name>HibernateFilter</filter-name>
 	<filter-class>org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter</filter-class>
 	<init-param>
@@ -75,29 +52,17 @@
 	</init-param>
 </filter>
 
-  <!--
-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
--->
+  <filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+</filter-mapping>
 <filter-mapping>
+    <filter-name>LocaleFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+</filter-mapping>
+<filter-mapping>
 	<filter-name>HibernateFilter</filter-name>
-	<url-pattern>*.do</url-pattern>
+	<url-pattern>/*</url-pattern>
 </filter-mapping>
 <filter-mapping>
 	<filter-name>HibernateFilter</filter-name>
@@ -110,27 +75,18 @@
 	</listener-class>
 </listener>	
 
- <!--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+   <servlet>
+      <servlet-name>performChosenGrouping</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.PerformChosenGroupingServlet</servlet-class>
 
-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.
+   </servlet>
+   <servlet>
+      <servlet-name>createLesson</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.CreateLessionServlet</servlet-class>
 
-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.
+   </servlet>
 
-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>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
@@ -152,32 +108,20 @@
     <load-on-startup>2</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-mapping>
 	<servlet-name>action</servlet-name>
     <url-pattern>*.do</url-pattern>
 </servlet-mapping>
 
+   <servlet-mapping>
+      <servlet-name>performChosenGrouping</servlet-name>
+      <url-pattern>/monitoring/performChosenGrouping</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>createLesson</servlet-name>
+      <url-pattern>/monitoring/createLesson</url-pattern>
+   </servlet-mapping>
+
    <session-config>
       <session-timeout>120</session-timeout>
    </session-config>
@@ -196,86 +140,61 @@
    <!ELEMENT error-page ((error-code | exception-type), location)>
    -->
 
-  <!--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+  	<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>
 
-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
--->
-<!-- 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: