Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -86,8 +86,8 @@
 	
 	<listener>
 		<listener-class>
-	 		org.lamsfoundation.lams.web.SessionListener
-	 	</listener-class>
+			org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+		</listener-class>
 	</listener>
 
 	<servlet>
@@ -172,10 +172,6 @@
 	    <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>
    
     <error-page>
         <error-code>500</error-code>