Index: lams_monitoring/conf/xdoclet/filters.xml
===================================================================
diff -u -rb395aaed7e903bdc2d4fbcc45a3191615e16f8d6 -r265c421629c4903f13dba67fae549d5e4f567e25
--- lams_monitoring/conf/xdoclet/filters.xml	(.../filters.xml)	(revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6)
+++ lams_monitoring/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 265c421629c4903f13dba67fae549d5e4f567e25)
@@ -21,7 +21,7 @@
 
 <filter>
 	<filter-name>HibernateFilter</filter-name>
-	<filter-class>org.springframework.orm.hibernate.support.OpenSessionInViewFilter</filter-class>
+	<filter-class>org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter</filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
 		<param-value>coreSessionFactory</param-value>
Index: lams_monitoring/conf/xdoclet/listeners.xml
===================================================================
diff -u
--- lams_monitoring/conf/xdoclet/listeners.xml	(revision 0)
+++ lams_monitoring/conf/xdoclet/listeners.xml	(revision 265c421629c4903f13dba67fae549d5e4f567e25)
@@ -0,0 +1,5 @@
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
\ No newline at end of file
Index: lams_monitoring/conf/xdoclet/servlets.xml
===================================================================
diff -u -rb395aaed7e903bdc2d4fbcc45a3191615e16f8d6 -r265c421629c4903f13dba67fae549d5e4f567e25
--- lams_monitoring/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6)
+++ lams_monitoring/conf/xdoclet/servlets.xml	(.../servlets.xml)	(revision 265c421629c4903f13dba67fae549d5e4f567e25)
@@ -18,13 +18,7 @@
 
 http://www.gnu.org/licenses/gpl.txt
 -->
-
 <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-<servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
Index: lams_monitoring/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -rb6df3bbcefaf4633858d1d3161063abc3b620e7e -r265c421629c4903f13dba67fae549d5e4f567e25
--- lams_monitoring/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision b6df3bbcefaf4633858d1d3161063abc3b620e7e)
+++ lams_monitoring/conf/xdoclet/struts-forms.xml	(.../struts-forms.xml)	(revision 265c421629c4903f13dba67fae549d5e4f567e25)
@@ -1,6 +1,7 @@
 <form-bean name="GateForm"  type="org.apache.struts.action.DynaActionForm">
+	<form-property name="gate" type="org.lamsfoundation.lams.learningdesign.GateActivity" />
 	<form-property name="activityId" type="java.lang.Long" />
-	<form-property name="waitingLearners" type="java.lang.Integer" />
+	<form-property name="waitingLearners" type="java.lang.Integer"/>
 	<form-property name="totalLearners" type="java.lang.Integer" />
 </form-bean>
 
Index: lams_monitoring/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb395aaed7e903bdc2d4fbcc45a3191615e16f8d6 -r265c421629c4903f13dba67fae549d5e4f567e25
--- lams_monitoring/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b395aaed7e903bdc2d4fbcc45a3191615e16f8d6)
+++ lams_monitoring/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 265c421629c4903f13dba67fae549d5e4f567e25)
@@ -26,9 +26,13 @@
 <context-param>
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
-		/WEB-INF/spring/applicationContext.xml /WEB-INF/spring/toolApplicationContext.xml
-		/WEB-INF/spring/monitoringApplicationContext.xml /WEB-INF/spring/lessonApplicationContext.xml
-		/WEB-INF/spring/authoringApplicationContext.xml	
-		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/surveyApplicationContext.xml
+		classpath*:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
+  		classpath*:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
+  		classpath*:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
+  		classpath*:/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml
+  		classpath*:/WEB-INF/authoringApplicationContext.xml
+  		classpath*:/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml
+  		classpath*:/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml       					  
+		classpath*:applicationContext.xml
 	</param-value>
 </context-param>