Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -16,7 +16,8 @@
             	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/chat/chatApplicationContext.xml		
+				classpath:/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	
+				classpath:/org/lamsfoundation/lams/tool/chat/dbupdates/autopatchContext.xml		
 	</param-value>
 </context-param>
 
@@ -63,8 +64,8 @@
 </listener>	
 <listener>
 	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
 </listener>
 
  <servlet>
@@ -93,7 +94,7 @@
 
 <servlet>
 	<servlet-name>Connector</servlet-name>
-	<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+	<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 	<init-param>
 		<param-name>baseDir</param-name>
 		<param-value>/UserFiles/</param-value>
@@ -156,6 +157,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: