Merge branch 'sessiontimeout' into 'master'

Http session timeout decrease

We are running ajax query to server every 20 seconds to keep conversations alive. This also keeps http sessions alive, and thus we do not have reason to keep sessions alive too long.

Originally session timeout was increased from 30 min to 2h to keep infomachines logged in even even at nights when there are extended perioids of inactivity. This is no longer necessary. Session stays alive as long as browser is open.

See merge request !270

code/moya-web/WebContent/WEB-INF/web.xml

@@ -40,10 +40,7 @@
 		<filter-name>PrimefacesFileupload</filter-name>
 		<servlet-name>Faces Servlet</servlet-name>
 	</filter-mapping>
-	<!-- <filter> <display-name>HostnameFilter</display-name> <filter-name>HostnameFilter</filter-name> 
-		<filter-class>fi.codecrew.moya.HostnameFilter</filter-class> </filter> <filter-mapping> 
-		<filter-name>HostnameFilter</filter-name> <servlet-name>*</servlet-name> 
-		</filter-mapping> -->
+	
 	<servlet>
 		<servlet-name>Faces Servlet</servlet-name>
 		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
@@ -58,7 +55,7 @@
 		</servlet-class> </servlet> <servlet-mapping> <servlet-name>ViewStatusMessages</servlet-name> 
 		<url-pattern>/logback</url-pattern> </servlet-mapping> -->
 	<session-config>
-		<session-timeout>120</session-timeout>
+		<session-timeout>10</session-timeout>
 	</session-config>
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>