Index: lams_admin/conf/xdoclet/listeners.xml
===================================================================
diff -u -rfc606f440dcd337bb3965e9af6b30eb2125c0af1 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_admin/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision fc606f440dcd337bb3965e9af6b30eb2125c0af1)
+++ lams_admin/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -3,4 +3,8 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>
- 	
\ No newline at end of file
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r72b80f6befe04cb189ab1e682082671d109a90b9 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 72b80f6befe04cb189ab1e682082671d109a90b9)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -72,11 +72,6 @@
 	<listener-class>
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
-</listener>	
-<listener>
-	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
 </listener>
 
  <servlet>
@@ -125,10 +120,6 @@
     <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</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:
Index: lams_central/conf/xdoclet/listeners.xml
===================================================================
diff -u -r24be011190dfeb262da94398fcfd60565ca259e7 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_central/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision 24be011190dfeb262da94398fcfd60565ca259e7)
+++ lams_central/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -15,3 +15,9 @@
 		org.apache.axis.transport.http.AxisHTTPSessionListener
 	</listener-class>
 </listener>
+
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
\ No newline at end of file
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -rc209be8131f22f6fe37bd8d6c14b56425a78b766 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision c209be8131f22f6fe37bd8d6c14b56425a78b766)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -18,6 +18,7 @@
 				classpath:/org/lamsfoundation/lams/web/webApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/integrationContext.xml
 				classpath:/org/lamsfoundation/lams/usermanagement/ldapContext.xml
+				classpath:/org/lamsfoundation/lams/dbupdates/autopatchContext.xml
 				<!--  Needed to communicate with the tools -->
 				classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
@@ -157,27 +158,23 @@
 	</listener-class>
 </listener>
 
-   <servlet>
-      <servlet-name>insertLearningDesign</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.InsertLDServlet</servlet-class>
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
 
-   </servlet>
    <servlet>
       <servlet-name>forgotPasswordServlet</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.ForgotPasswordServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>flashCrashDump</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
+      <servlet-name>dumpWDDX</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.ReportWddxStructureServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>storeLD</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.StoreLDServlet</servlet-class>
-
-   </servlet>
-   <servlet>
       <servlet-name>SimpleUploader</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.LAMSUploadServlet</servlet-class>
 
@@ -222,31 +219,11 @@
 
    </servlet>
    <servlet>
-      <servlet-name>copyMultipleToolContent</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.CopyMultipleToolContentServlet</servlet-class>
-
-   </servlet>
-   <servlet>
       <servlet-name>updateCollapsedGroup</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.UpdateCollapsedGroupServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>storeNotebookEntry</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
-
-   </servlet>
-   <servlet>
-      <servlet-name>storeTheme</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.themes.web.StoreThemeServlet</servlet-class>
-
-   </servlet>
-   <servlet>
-      <servlet-name>LessonJoinServlet</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.webservice.xml.LessonJoinServlet</servlet-class>
-
-   </servlet>
-   <servlet>
       <servlet-name>Connector</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.LAMSConnectorServlet</servlet-class>
 
@@ -263,8 +240,8 @@
 
    </servlet>
    <servlet>
-      <servlet-name>saveLessonOrder</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.LessonOrderServlet</servlet-class>
+      <servlet-name>flashCrashDump</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
 
    </servlet>
    <servlet>
@@ -273,11 +250,46 @@
 
    </servlet>
    <servlet>
-      <servlet-name>dumpWDDX</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.web.ReportWddxStructureServlet</servlet-class>
+      <servlet-name>LessonJoinServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.xml.LessonJoinServlet</servlet-class>
 
    </servlet>
+   <servlet>
+      <servlet-name>storeLD</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.StoreLDServlet</servlet-class>
 
+   </servlet>
+   <servlet>
+      <servlet-name>saveLessonOrder</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.LessonOrderServlet</servlet-class>
+
+   </servlet>
+   <servlet>
+      <servlet-name>storeTheme</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.themes.web.StoreThemeServlet</servlet-class>
+
+   </servlet>
+   <servlet>
+      <servlet-name>insertLearningDesign</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.InsertLDServlet</servlet-class>
+
+   </servlet>
+   <servlet>
+      <servlet-name>BogoPogoServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.BogoPogoServlet</servlet-class>
+
+   </servlet>
+   <servlet>
+      <servlet-name>storeNotebookEntry</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
+
+   </servlet>
+   <servlet>
+      <servlet-name>copyMultipleToolContent</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.CopyMultipleToolContentServlet</servlet-class>
+
+   </servlet>
+
  <servlet>
 	<servlet-name>action</servlet-name>
 	<servlet-class>
@@ -398,66 +410,66 @@
 </servlet-mapping>
 
    <servlet-mapping>
-      <servlet-name>insertLearningDesign</servlet-name>
-      <url-pattern>/servlet/authoring/insertLearningDesign</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
       <servlet-name>forgotPasswordServlet</servlet-name>
       <url-pattern>/ForgotPasswordRequest</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>flashCrashDump</servlet-name>
-      <url-pattern>/servlet/flashCrashDump</url-pattern>
+      <servlet-name>dumpWDDX</servlet-name>
+      <url-pattern>/servlet/dumpWDDX</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>storeLD</servlet-name>
-      <url-pattern>/servlet/authoring/storeLearningDesignDetails</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
       <servlet-name>SimpleUploader</servlet-name>
       <url-pattern>/fckeditor/editor/filemanager/upload/simpleuploader</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>copyMultipleToolContent</servlet-name>
-      <url-pattern>/servlet/authoring/copyMultipleToolContent</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
       <servlet-name>updateCollapsedGroup</servlet-name>
       <url-pattern>/servlet/updateCollapsedGroup</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>storeNotebookEntry</servlet-name>
-      <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
+      <servlet-name>Connector</servlet-name>
+      <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>storeTheme</servlet-name>
-      <url-pattern>/themes/servlet/storeTheme</url-pattern>
+      <servlet-name>flashCrashDump</servlet-name>
+      <url-pattern>/servlet/flashCrashDump</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>editLD</servlet-name>
+      <url-pattern>/eof/authoring/editLearningDesign</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>LessonJoinServlet</servlet-name>
       <url-pattern>/services/xml/LessonJoin/*</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>Connector</servlet-name>
-      <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+      <servlet-name>storeLD</servlet-name>
+      <url-pattern>/servlet/authoring/storeLearningDesignDetails</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>saveLessonOrder</servlet-name>
       <url-pattern>/servlet/saveLessonOrder</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>editLD</servlet-name>
-      <url-pattern>/eof/authoring/editLearningDesign</url-pattern>
+      <servlet-name>storeTheme</servlet-name>
+      <url-pattern>/themes/servlet/storeTheme</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>dumpWDDX</servlet-name>
-      <url-pattern>/servlet/dumpWDDX</url-pattern>
+      <servlet-name>insertLearningDesign</servlet-name>
+      <url-pattern>/servlet/authoring/insertLearningDesign</url-pattern>
    </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>BogoPogoServlet</servlet-name>
+      <url-pattern>/BogoPogo</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>storeNotebookEntry</servlet-name>
+      <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>copyMultipleToolContent</servlet-name>
+      <url-pattern>/servlet/authoring/copyMultipleToolContent</url-pattern>
+   </servlet-mapping>
 
-   <session-config>
-      <session-timeout>120</session-timeout>
-   </session-config>
-
   <mime-mapping>
 	<extension>csv</extension>
 	<mime-type>text/plain</mime-type>
Index: lams_common/src/java/org/lamsfoundation/lams/web/session/SetMaxTimeoutListener.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/web/session/SetMaxTimeoutListener.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/web/session/SetMaxTimeoutListener.java	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -0,0 +1,56 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */ 
+ 
+/* $Id$ */ 
+package org.lamsfoundation.lams.web.session; 
+
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+ 
+/**
+ * @author jliew
+ *
+ */
+public class SetMaxTimeoutListener implements HttpSessionListener {
+
+	private static Logger log = Logger.getLogger(SetMaxTimeoutListener.class); 
+	
+	public void sessionCreated(HttpSessionEvent se)
+	{
+		try {
+			int timeout = Configuration.getAsInt(ConfigurationKeys.INACTIVE_TIME);
+			se.getSession().setMaxInactiveInterval(timeout);
+		} catch (Exception e) {
+			log.error("Couldn't set max inactive interval due to exception, ", e);
+		}
+	}
+
+	public void sessionDestroyed(HttpSessionEvent se)
+	{
+		//nothing to do
+	}
+}
+ 
\ No newline at end of file
Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rcdab8186de5e9c75a9d6774616ead602dbf9cb69 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
+++ lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -19,3 +19,8 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r4f68a533e24967e0185132c5e361a8a054f43941 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -130,11 +130,7 @@
       <servlet-name>groupingExportPortfolio</servlet-name>
       <url-pattern>/groupingExportPortfolio</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:
@@ -219,10 +215,8 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
-    		<role-name>TEACHER</role-name>
     		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
-    		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
 			<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
Index: lams_monitoring/conf/xdoclet/listeners.xml
===================================================================
diff -u -r265c421629c4903f13dba67fae549d5e4f567e25 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_monitoring/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision 265c421629c4903f13dba67fae549d5e4f567e25)
+++ lams_monitoring/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -2,4 +2,9 @@
 	<listener-class>
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
-</listener>	
\ No newline at end of file
+</listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/web.xml
===================================================================
diff -u -rc209be8131f22f6fe37bd8d6c14b56425a78b766 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision c209be8131f22f6fe37bd8d6c14b56425a78b766)
+++ lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -69,13 +69,13 @@
 </listener>	
 
    <servlet>
-      <servlet-name>gateExportPortfolio</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.monitoring.web.GateExportPortfolioServlet</servlet-class>
+      <servlet-name>initializeLesson</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.InitializeLessonServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>createLessonClass</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.monitoring.web.CreateLessonServlet</servlet-class>
+      <servlet-name>performChosenGrouping</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.PerformChosenGroupingServlet</servlet-class>
 
    </servlet>
    <servlet>
@@ -84,8 +84,8 @@
 
    </servlet>
    <servlet>
-      <servlet-name>performChosenGrouping</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.monitoring.web.PerformChosenGroupingServlet</servlet-class>
+      <servlet-name>gateExportPortfolio</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.GateExportPortfolioServlet</servlet-class>
 
    </servlet>
    <servlet>
@@ -94,8 +94,8 @@
 
    </servlet>
    <servlet>
-      <servlet-name>initializeLesson</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.monitoring.web.InitializeLessonServlet</servlet-class>
+      <servlet-name>createLessonClass</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.CreateLessonServlet</servlet-class>
 
    </servlet>
 
@@ -127,34 +127,30 @@
 </servlet-mapping>
 
    <servlet-mapping>
-      <servlet-name>gateExportPortfolio</servlet-name>
-      <url-pattern>/gateExportPortfolio</url-pattern>
+      <servlet-name>initializeLesson</servlet-name>
+      <url-pattern>/initializeLesson</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>createLessonClass</servlet-name>
-      <url-pattern>/createLessonClass</url-pattern>
+      <servlet-name>performChosenGrouping</servlet-name>
+      <url-pattern>/monitoring/performChosenGrouping</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>branchingExportPortfolio</servlet-name>
       <url-pattern>/branchingExportPortfolio</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>performChosenGrouping</servlet-name>
-      <url-pattern>/monitoring/performChosenGrouping</url-pattern>
+      <servlet-name>gateExportPortfolio</servlet-name>
+      <url-pattern>/gateExportPortfolio</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>sequenceExportPortfolio</servlet-name>
       <url-pattern>/sequenceExportPortfolio</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>initializeLesson</servlet-name>
-      <url-pattern>/initializeLesson</url-pattern>
+      <servlet-name>createLessonClass</servlet-name>
+      <url-pattern>/createLessonClass</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:
@@ -238,10 +234,8 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
-    		<role-name>TEACHER</role-name>
     		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
-    		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
 			<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
Index: lams_tool_chat/conf/xdoclet/listeners.xml
===================================================================
diff -u -red16d5f8991580c9160628f30a49e947a0b154bb -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_chat/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision ed16d5f8991580c9160628f30a49e947a0b154bb)
+++ lams_tool_chat/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -5,7 +5,7 @@
 </listener>	
 <listener>
 	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
 </listener>
  	
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
+++ lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -16,7 +16,7 @@
             	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		
 	</param-value>
 </context-param>
 
@@ -156,10 +156,6 @@
 	<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:
Index: lams_tool_daco/web/WEB-INF/web.xml
===================================================================
diff -u -rbe03cfbba16a388e85d82cb8986f63d6b2ad568b -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision be03cfbba16a388e85d82cb8986f63d6b2ad568b)
+++ lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -26,6 +26,11 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
 
     <filter>
     <filter-name>hibernateFilter</filter-name>
Index: lams_tool_dimdim/conf/xdoclet/listeners.xml
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_dimdim/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -5,7 +5,6 @@
 </listener>	
 <listener>
 	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
 </listener>
- 	
Index: lams_tool_dimdim/web/WEB-INF/web.xml
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_dimdim/web/WEB-INF/web.xml	(.../web.xml)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -61,11 +61,6 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
-<listener>
-	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
-</listener>
 
  <servlet>
 	<servlet-name>action</servlet-name>
@@ -144,10 +139,6 @@
 	<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:
Index: lams_tool_example/conf/xdoclet/listeners.xml
===================================================================
diff -u -rbb7c63e87a565c0227aed9eadb9047da764cfde8 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_example/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision bb7c63e87a565c0227aed9eadb9047da764cfde8)
+++ lams_tool_example/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -5,7 +5,7 @@
 </listener>	
 <listener>
 	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
 </listener>
  	
\ No newline at end of file
Index: lams_tool_example/web/WEB-INF/web.xml
===================================================================
diff -u -rad683fcaeabe83c702b599c5c866bb7d30cd7191 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_example/web/WEB-INF/web.xml	(.../web.xml)	(revision ad683fcaeabe83c702b599c5c866bb7d30cd7191)
+++ lams_tool_example/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -122,10 +122,6 @@
     <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</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:
Index: lams_tool_forum/conf/xdoclet/listeners.xml
===================================================================
diff -u -rfdb3e5c043522549d839142cfb3ef4e919913bbd -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_forum/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
+++ lams_tool_forum/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -3,3 +3,8 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r40b737e444a9671a1257da02550525f3fa211950 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 40b737e444a9671a1257da02550525f3fa211950)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -148,10 +148,6 @@
 	<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:
Index: lams_tool_gmap/conf/xdoclet/listeners.xml
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_gmap/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -5,7 +5,7 @@
 </listener>	
 <listener>
 	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
 </listener>
  	
Index: lams_tool_gmap/web/WEB-INF/web.xml
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_gmap/web/WEB-INF/web.xml	(.../web.xml)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -144,10 +144,6 @@
 	<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:
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -66,8 +66,8 @@
 	
 	<listener>
 		<listener-class>
-	 		org.lamsfoundation.lams.web.SessionListener
-	 	</listener-class>
+			org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+		</listener-class>
 	</listener>
 
 	<servlet>
@@ -141,10 +141,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>
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -67,8 +67,8 @@
 	
 	<listener>
 		<listener-class>
-	 		org.lamsfoundation.lams.web.SessionListener
-	 	</listener-class>
+			org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+		</listener-class>
 	</listener>
 	
 	<servlet>
@@ -144,10 +144,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>
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
diff -u -r9bc685cb9403f44bda200a3f36d4f2e11a89b25b -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 9bc685cb9403f44bda200a3f36d4f2e11a89b25b)
+++ lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -27,6 +27,12 @@
 	</listener-class>
 </listener>	
 
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
+
     <filter>
     <filter-name>hibernateFilter</filter-name>
     <filter-class>
Index: lams_tool_nb/conf/xdoclet/listeners.xml
===================================================================
diff -u -rfdb3e5c043522549d839142cfb3ef4e919913bbd -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_nb/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
+++ lams_tool_nb/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -3,3 +3,8 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
+++ lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -134,10 +134,6 @@
 		<url-pattern>/portfolioExport</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:
Index: lams_tool_notebook/conf/xdoclet/listeners.xml
===================================================================
diff -u -r5948e17402e1ad574aeddbe55f93dca2f58bbbec -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_notebook/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision 5948e17402e1ad574aeddbe55f93dca2f58bbbec)
+++ lams_tool_notebook/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -5,7 +5,7 @@
 </listener>	
 <listener>
 	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
 </listener>
  	
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/web.xml
===================================================================
diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
+++ lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -144,10 +144,6 @@
 	<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:
Index: lams_tool_sbmt/conf/xdoclet/listeners.xml
===================================================================
diff -u -rfdb3e5c043522549d839142cfb3ef4e919913bbd -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_sbmt/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision fdb3e5c043522549d839142cfb3ef4e919913bbd)
+++ lams_tool_sbmt/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -3,3 +3,8 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -141,10 +141,6 @@
 	<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:
Index: lams_tool_scribe/conf/xdoclet/listeners.xml
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_scribe/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -5,7 +5,7 @@
 </listener>	
 <listener>
 	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
 </listener>
  	
Index: lams_tool_scribe/web/WEB-INF/web.xml
===================================================================
diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
+++ lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -61,11 +61,6 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
-<listener>
-	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
-</listener>
 
  <servlet>
 	<servlet-name>action</servlet-name>
@@ -144,10 +139,6 @@
 	<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:
Index: lams_tool_survey/web/WEB-INF/web.xml
===================================================================
diff -u -r48ecaca457cd67a79a45aa681613f2d9f058e0d0 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
+++ lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -26,6 +26,11 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
 
     <filter>
     <filter-name>hibernateFilter</filter-name>
Index: lams_tool_task/web/WEB-INF/web.xml
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision 875f56cb6917d1a52bed0545f2933c3b55497a02)
+++ lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -26,6 +26,11 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
 
     <filter>
     <filter-name>hibernateFilter</filter-name>
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>
Index: lams_tool_wiki_orig/conf/xdoclet/listeners.xml
===================================================================
diff -u -re8343e8d676900d059435abdef072abc89d3b26b -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_wiki_orig/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e8343e8d676900d059435abdef072abc89d3b26b)
+++ lams_tool_wiki_orig/conf/xdoclet/listeners.xml	(.../listeners.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -3,3 +3,8 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
\ No newline at end of file
Index: lams_tool_wiki_orig/web/WEB-INF/web.xml
===================================================================
diff -u -r51ab92ac37624b5c280cbd5f3ae8e3972b8540ff -re851ecbb7a28dba597688df7f4466b2ab603405c
--- lams_tool_wiki_orig/web/WEB-INF/web.xml	(.../web.xml)	(revision 51ab92ac37624b5c280cbd5f3ae8e3972b8540ff)
+++ lams_tool_wiki_orig/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
@@ -127,6 +127,13 @@
 	    </init-param>
 	    <load-on-startup>3</load-on-startup>
 	</servlet>
+<servlet>
+	<servlet-name>WikiLinkHandler</servlet-name>
+	<display-name>WikiLinkHandler Servlet For FCKEditor</display-name>
+	<servlet-class>
+		org.lamsfoundation.lams.tool.wiki.web.WikiLinkHandlerServlet
+	</servlet-class>
+</servlet>
 
   <servlet-mapping>
 	<servlet-name>action</servlet-name>
@@ -148,9 +155,10 @@
 	<url-pattern>/exportPortfolio</url-pattern>
 </servlet-mapping>
 
-   <session-config>
-      <session-timeout>120</session-timeout>
-   </session-config>
+<servlet-mapping>
+	<servlet-name>WikiLinkHandler</servlet-name>
+	<url-pattern>/WikiLinkHandler</url-pattern>
+</servlet-mapping>
 
    <!--
    To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.