Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -r673efe2cf1287003e7962dca49626c1ebe8ae9e1 -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 673efe2cf1287003e7962dca49626c1ebe8ae9e1)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f)
@@ -1,61 +1,101 @@
 <?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  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">
+ <!--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
-<web-app >
- <context-param>
-  	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.tool.qa.web.QaResources</param-value>
-</context-param>
+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>
+		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+	  	<param-value>org.lamsfoundation.lams.tool.qa.web.QaResources</param-value>
+	</context-param>
+	
+	<context-param> 
 		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			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/contentrepository/applicationContext.xml
-			classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
-		</param-value>
+			<param-value>
+				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/contentrepository/applicationContext.xml
+				classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
+			</param-value>
 	</context-param>
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>	
 
     <filter>
-    <filter-name>hibernateFilter</filter-name>
-    <filter-class>
-      org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
-    </filter-class>
-    <init-param>
-      <param-name>sessionFactoryBeanName</param-name>
-      <param-value>qaSessionFactory</param-value>
-    </init-param>
+	    <filter-name>SystemSessionFilter</filter-name>
+	     <filter-class>
+		   org.lamsfoundation.lams.web.session.SystemSessionFilter
+	     </filter-class>
+  	</filter>
+  	
+  	<filter>
+	    <filter-name>hibernateFilter</filter-name>
+	    <filter-class>
+	      org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter
+	    </filter-class>
+		<init-param>
+			<param-name>sessionFactoryBeanName</param-name>
+			<param-value>qaSessionFactory</param-value>
+		</init-param>
    </filter>
-   <!-- System session filter -->
-   <filter>
-       <filter-name>SystemSessionFilter</filter-name>
+
+	<filter>
+		<filter-name>LocaleFilter</filter-name>
          <filter-class>
-		   org.lamsfoundation.lams.web.session.SystemSessionFilter
+		   org.lamsfoundation.lams.web.filter.LocaleFilter
          </filter-class>
-     </filter>
+	</filter>
 
     <filter-mapping>
-	    <filter-name>hibernateFilter</filter-name>
-    	 <url-pattern>/*</url-pattern>
-  	</filter-mapping>
-    <filter-mapping>
     	<filter-name>SystemSessionFilter</filter-name>
+     	<url-pattern>/*</url-pattern> 
+  	</filter-mapping>
+  
+   <filter-mapping>
+    	<filter-name>hibernateFilter</filter-name>
      	<url-pattern>/*</url-pattern>
-	 </filter-mapping>
+  	</filter-mapping>
 
+	<filter-mapping>
+    	<filter-name>LocaleFilter</filter-name>
+	     <url-pattern>/*</url-pattern>
+   </filter-mapping>
+
+  	<listener>
+		<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>	
+	
+	<listener>
+		<listener-class>
+	 		org.lamsfoundation.lams.web.SessionListener
+	 	</listener-class>
+	</listener>
+
 	<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>
@@ -77,28 +117,9 @@
 	    </init-param>
 	    <load-on-startup>2</load-on-startup>
     </servlet>
-   
- <!--    
-    <servlet>
-            <servlet-name>Connector</servlet-name>
-            <servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</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>false</param-value>
-            </init-param>
-            <load-on-startup>1</load-on-startup>
-	</servlet>
--->
 
-<!--  The download servlet, reused from the content repository jar -->
 	<servlet>
 		<servlet-name>download</servlet-name>
-		<display-name>Instructions Download</display-name>
-		<description>Instructions Download</description>		
 		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
 	    <init-param>
 	      <param-name>toolContentHandlerBeanName</param-name>
@@ -109,14 +130,27 @@
 	
 	<servlet>
 		<servlet-name>exportPortfolio</servlet-name>
-		<display-name>Export Portfolio</display-name>
-		<description>Export Portfolio</description>		
 		<servlet-class>org.lamsfoundation.lams.tool.qa.web.QaExportServlet</servlet-class>
 	</servlet>
-	
+
+<!--  FCKEditor Connector Configuration -->
+	<servlet>
+		<servlet-name>Connector</servlet-name>
+		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</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>false</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
 	<servlet-mapping>
 		<servlet-name>action</servlet-name>
-	   	<url-pattern>*.do</url-pattern>
+	    <url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>
@@ -128,112 +162,106 @@
 		<servlet-name>exportPortfolio</servlet-name>
 		<url-pattern>/portfolioExport</url-pattern>
   	</servlet-mapping>
-  	
 
-<!--
-  	<servlet-mapping>
-	        <servlet-name>Connector</servlet-name>
-             <url-pattern>/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
-	</servlet-mapping>             
--->
-              	
+	<servlet-mapping>
+	    <servlet-name>Connector</servlet-name>
+	    <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	</servlet-mapping>
 
-   <session-config>
-      <session-timeout>120</session-timeout>
-   </session-config>
+   	<session-config>
+      	<session-timeout>120</session-timeout>
+   	</session-config>
    
-     <error-page>
+    <error-page>
 		<error-code>403</error-code>
 		<location>/403.html</location>
 	</error-page>
+   
+   <!--
+   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:
 
-<!--  ======================================================== -->	
-<!-- Struts Tag Library Descriptors -->
-<!--  ======================================================== -->	
-<taglib>
-    <taglib-uri>tags-bean</taglib-uri>
-    <taglib-location>/WEB-INF/struts/tlds/struts-bean.tld</taglib-location>
-</taglib>
+   <!ELEMENT mime-mapping (extension, mime-type)>
+   -->
 
-<taglib>
-    <taglib-uri>tags-html</taglib-uri>
-    <taglib-location>/WEB-INF/struts/tlds/struts-html.tld</taglib-location>
-</taglib>
+   <!--
+   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:
 
-<taglib>
-    <taglib-uri>tags-logic</taglib-uri>
-    <taglib-location>/WEB-INF/struts/tlds/struts-logic.tld</taglib-location>
-</taglib>
+   <!ELEMENT error-page ((error-code | exception-type), location)>
+   -->
 
-<taglib>
-    <taglib-uri>tags-tiles</taglib-uri>
-    <taglib-location>/WEB-INF/struts/tlds/struts-tiles.tld</taglib-location>
-</taglib>
+  	<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>
+		<!--  ======================================================== -->	
+		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
+		<!--  ======================================================== -->	
+		  <taglib>
+		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/permittedTaglibs.tld</taglib-location>
+		  </taglib>
+		  <taglib>
+		    <taglib-uri>tags-scriptfree</taglib-uri>
+		    <taglib-location>/WEB-INF/jstl/tlds/scriptfree.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>
+		 <taglib>
+		   <taglib-uri>tags-lams</taglib-uri>
+		   <taglib-location>/WEB-INF/lams.tld</taglib-location>
+		</taglib>
+	</jsp-config>
 
-<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>
-
-
-<!--  ======================================================== -->	
-<!--  JSTL Tag Library -->
-<!--  ======================================================== -->	
-  <taglib>
-    <taglib-uri>tags-fmt</taglib-uri>
-    <taglib-location>/WEB-INF/jstl/tlds/fmt.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>tags-fmt-rt</taglib-uri>
-    <taglib-location>/WEB-INF/jstl/tlds/fmt-rt.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>tags-c</taglib-uri>
-    <taglib-location>/WEB-INF/jstl/tlds/c.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>tags-core-rt</taglib-uri>
-    <taglib-location>/WEB-INF/jstl/tlds/c-rt.tld</taglib-location>
-  </taglib>
-  
-  
-  
-	<!--  ======================================================== -->	
-	<!--   LAMS Tag Library -->
-	<!--  ======================================================== -->	
-	<taglib>
-	   <taglib-uri>tags-lams</taglib-uri>
-	   <taglib-location>/WEB-INF/lams.tld</taglib-location>
-	</taglib>
-	
-	<taglib>
-	    <taglib-uri>tags-fck-editor</taglib-uri>
-	    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-	</taglib>
-
   	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
 	    	<web-resource-name>Secure Content</web-resource-name>
-			<url-pattern>/*</url-pattern>
+    		<url-pattern>*.jsp</url-pattern>
+    		<url-pattern>*.html</url-pattern>
+    		<url-pattern>/index.jsp</url-pattern>
+    		<url-pattern>/flashCrashDump</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
@@ -245,46 +273,43 @@
     	</auth-constraint>
     </security-constraint>
 
-   <!--  Security Constraint -->
-	<security-constraint>
+    <security-constraint>
 	   	<web-resource-collection>
-	    	<web-resource-name>Secure Content</web-resource-name>
-			<url-pattern>/*</url-pattern>
+	    	<web-resource-name>Authoring Update</web-resource-name>
+		    <url-pattern>/authoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>LEARNER</role-name>
-    		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
     		<role-name>AUTHOR</role-name>
-    		<role-name>ADMIN</role-name>
-    		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
+		    <url-pattern>/monitoring.do</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>STAFF</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
     <security-constraint>
 	   	<web-resource-collection>
-	    	<web-resource-name>Authoring Update</web-resource-name>
-		    <url-pattern>/authoringStarter.do</url-pattern>
-		   <url-pattern>/authoring.do</url-pattern>
-		 </web-resource-collection>
+	    	<web-resource-name>Adminstrator Content</web-resource-name>
+		    <url-pattern>/admin.do</url-pattern> 
+    	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>AUTHOR</role-name>
+    		<role-name>ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
-    
-    
     <security-constraint>
 	   	<web-resource-collection>
-	    	<web-resource-name>Staff Content</web-resource-name>
-		    <url-pattern>/monitoringStarter.do</url-pattern>
-		    <url-pattern>/monitoring.do</url-pattern>		   
+	    	<web-resource-name>LAMS System Adminstrator Content</web-resource-name>
+		    <url-pattern>/sysadmin.do</url-pattern> 
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
-
-    
 	<!--  some combine role security setting -->
     <security-constraint>
 	   	<web-resource-collection>
@@ -299,14 +324,45 @@
     	</auth-constraint>
     </security-constraint>
 
-
 	<!--  Login Configuration -->
   	<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>
+    <!-- ======================================================== -->
+	<!--  Security Roles -->
+    <!-- ======================================================== -->
+	<security-role>
+		<description>Student</description>
+		<role-name>LEARNER</role-name>
+	</security-role>
+	<security-role>
+		<description>Student</description>
+		<role-name>TEACHER</role-name>
+	</security-role>
 
+	<security-role>
+		<description>Can create/modify a learning design</description>
+		<role-name>AUTHOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can running and monitoring a learning session</description>
+		<role-name>STAFF</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>ADMIN</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>SYSADMIN</role-name>
+	</security-role>
+
 </web-app>