Index: lams_monitoring/web/WEB-INF/web.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -racc8d2acf5b6b0002e0c8129947040a779ab4077
--- lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
@@ -5,20 +5,24 @@
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.monitoring.ApplicationResources</param-value>
 </context-param>
+
 <context-param>
+	<param-name>messageSource</param-name>
+	<param-value>monitoringMessageSource</param-value>
+</context-param>
+
+<context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-		classpath:/org/lamsfoundation/lams/applicationContext.xml
-		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
-		<!--  Add tool contexts after this -->
-	</param-value>
+	<param-value></param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
   <filter>
        <filter-name>SystemSessionFilter</filter-name>
@@ -67,6 +71,11 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
 
    <servlet>
       <servlet-name>initializeLesson</servlet-name>
@@ -79,6 +88,11 @@
 
    </servlet>
    <servlet>
+      <servlet-name>initializeAndCreateLessons</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.monitoring.web.InitializeAndCreateLessonsServlet</servlet-class>
+
+   </servlet>
+   <servlet>
       <servlet-name>branchingExportPortfolio</servlet-name>
       <servlet-class>org.lamsfoundation.lams.monitoring.web.BranchingExportPortfolioServlet</servlet-class>
 
@@ -135,6 +149,10 @@
       <url-pattern>/monitoring/performChosenGrouping</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>initializeAndCreateLessons</servlet-name>
+      <url-pattern>/initializeAndCreateLessons</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>branchingExportPortfolio</servlet-name>
       <url-pattern>/branchingExportPortfolio</url-pattern>
    </servlet-mapping>
@@ -151,6 +169,10 @@
       <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: