Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -r59e4b8d442ec5f40e2e7a5bef1bda2059953b59a
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 59e4b8d442ec5f40e2e7a5bef1bda2059953b59a)
@@ -18,19 +18,14 @@
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml	
   		classpath:/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
+  		classpath:/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.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
+      org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter
     </filter-class>
     <init-param>
       <param-name>sessionFactoryBeanName</param-name>
@@ -73,6 +68,11 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
 
  <servlet>
 		<servlet-name>exportPortfolio</servlet-name>
@@ -148,6 +148,10 @@
 	<url-pattern>/exportPortfolio</url-pattern>
 </servlet-mapping>
 
+   <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: