Index: lams_tool_laqa/test/web/WEB-INF/web.xml
===================================================================
diff -u -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d -rb859dab1f3cce4985a7b5266083b899bdfc92fdb
--- lams_tool_laqa/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
+++ lams_tool_laqa/test/web/WEB-INF/web.xml	(.../web.xml)	(revision b859dab1f3cce4985a7b5266083b899bdfc92fdb)
@@ -1,104 +1,78 @@
 <?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">
 
-<web-app >
 	<context-param>
-	  	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-	  	<param-value>org.lamsfoundation.lams.tool.qa.QaResources</param-value>
+		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+	  	<param-value>org.lamsfoundation.lams.tool.qa.ApplicationResources</param-value>
 	</context-param>
-	<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/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/toolApplicationContext.xml
+		    	classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
+				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
+				classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
+				classpath:/org/lamsfoundation/lams/tool/qa/dbupdates/autopatchContext.xml
+			</param-value>
 	</context-param>
-	
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>	
-<!-- 	
-	<filter>
-    <filter-name>contentFilter</filter-name>
-    <filter-class>org.lamsfoundation.lams.web.filter.ResponseCaptureFilter</filter-class>
-	</filter>
 
-	<filter-mapping>
-	    <filter-name>contentFilter</filter-name>
-	    <url-pattern>/portfolioExport</url-pattern>
-	</filter-mapping> -->
-   <!-- System session filter -->
-   <filter>
-       <filter-name>SystemSessionFilter</filter-name>
-         <filter-class>
+    <filter>
+	    <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>
+
+	<filter>
+		<filter-name>LocaleFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.filter.LocaleFilter
          </filter-class>
-     </filter>
+	</filter>
 
     <filter-mapping>
- 	   <filter-name>SystemSessionFilter</filter-name>
-    	 <url-pattern>/*</url-pattern>
-   </filter-mapping>	
-   
-   <!--  Servlet defination -->
-<!-- 	<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>
-	
-	<servlet-mapping>
-		<servlet-name>exportPortfolio</servlet-name>
-		<url-pattern>/portfolioExport</url-pattern>
-  	</servlet-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>
 
-    <!--
-    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.
-    -->
+	<filter-mapping>
+    	<filter-name>LocaleFilter</filter-name>
+	     <url-pattern>/*</url-pattern>
+   </filter-mapping>
 
-    <!--
-    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.
-    -->
-
-     	<!--
-	  - 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.
-		-->
+  	<listener>
+		<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>	
+	
+	<listener>
+		<listener-class>
+			org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+		</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>
 	    <init-param>
@@ -117,48 +91,74 @@
 	      <param-name>validate</param-name>
 	      <param-value>true</param-value>
 	    </init-param>
-	    <load-on-startup>2</load-on-startup>
+	    <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>
-                  <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-name>download</servlet-name>
+		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
+	    <init-param>
+	      <param-name>toolContentHandlerBeanName</param-name>
+	      <param-value>qaToolContentHandler</param-value>
+	    </init-param>
+	    <load-on-startup>3</load-on-startup>
 	</servlet>
+	
+	<servlet>
+		<servlet-name>exportPortfolio</servlet-name>
+		<servlet-class>org.lamsfoundation.lams.tool.qa.web.ExportServlet</servlet-class>
+	</servlet>
+	
 
-  	<servlet-mapping>
+<!--  FCKEditor Connector Configuration -->
+	<servlet>
+		<servlet-name>Connector</servlet-name>
+		<servlet-class>net.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>
+		<servlet-name>download</servlet-name>
+		<url-pattern>/download/*</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-name>exportPortfolio</servlet-name>
+		<url-pattern>/exportPortfolio/*</url-pattern>
+  	</servlet-mapping>
 
-   <session-config>
-      <session-timeout>120</session-timeout>
-   </session-config>
-   
-     <error-page>
-	<error-code>403</error-code>
-	<location>/403.html</location>
-</error-page>
-   
-   <taglib>
-    <taglib-uri>fck-editor</taglib-uri>
-    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
-  </taglib>
 
+	<servlet-mapping>
+	    <servlet-name>Connector</servlet-name>
+	    <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	</servlet-mapping>
+   
+    <error-page>
+        <error-code>500</error-code>
+        <location>/error.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>403</error-code>
+        <location>/403.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>404</error-code>
+        <location>/404.jsp</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:
@@ -173,32 +173,60 @@
    <!ELEMENT error-page ((error-code | exception-type), location)>
    -->
 
-  <!--
-  To add taglibs by xml, create a file called taglibs.xml and place it
-  in your merge dir.
-  -->
+  	<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>
+			<taglib>
+			   <taglib-uri>tags-lams</taglib-uri>
+			   <taglib-location>/WEB-INF/lams.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)>
-   -->
-   
-   <!--  Security Constraint -->
+  	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
 	    	<web-resource-name>Secure Content</web-resource-name>
@@ -218,26 +246,43 @@
 	   	<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-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
+    		<role-name>AUTHOR 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>/monitoringStarter.do</url-pattern>
-		    <url-pattern>/monitoring.do</url-pattern>		   
+		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>MONITOR</role-name>
+    		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
 
-    
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Adminstrator Content</web-resource-name>
+		    <url-pattern>/admin.do</url-pattern> 
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>ADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>LAMS System Adminstrator Content</web-resource-name>
+		    <url-pattern>/sysadmin.do</url-pattern> 
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
 	<!--  some combine role security setting -->
     <security-constraint>
 	   	<web-resource-collection>
@@ -247,19 +292,59 @@
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
     		<role-name>MONITOR</role-name>
+    		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 
+  <!-- ======================================================== -->
+	<!--  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>MONITOR</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>
+	
+	<security-role>
+		<description>Can create/modify a learning design and edit default tool content</description>
+		<role-name>AUTHOR ADMIN</role-name>
+	</security-role>
+	
 	<!--  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>
-   
 
+
 </web-app>