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>