Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r5b9f590b301c276f8df06b30c26981b0eb634e69 -r3f3f34c22194aeaf302e1fd332925dffd35019aa
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 5b9f590b301c276f8df06b30c26981b0eb634e69)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
@@ -15,14 +15,6 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/admin/adminApplicationContext.xml</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>
 
 	<context-param>
 		<param-name>migration.systemname</param-name>
@@ -75,6 +67,10 @@
 		</init-param>
     </filter>
     <filter>
+        <filter-name>AuditLogFilter</filter-name>
+        <filter-class>org.lamsfoundation.lams.web.filter.AuditLogFilter</filter-class>
+    </filter>
+    <filter>
         <filter-name>CSRFGuard</filter-name>
         <filter-class>org.owasp.csrfguard.CsrfGuardFilter</filter-class>
     </filter>
@@ -92,6 +88,10 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
     <filter-mapping>
+        <filter-name>AuditLogFilter</filter-name>
+        <url-pattern>*.do</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
         <filter-name>CSRFGuard</filter-name>
         <url-pattern>*.do</url-pattern>
     </filter-mapping>
@@ -101,7 +101,7 @@
 	</listener>
 	<listener>
 		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
+			org.lamsfoundation.lams.web.filter.LamsContextLoaderListener
 		</listener-class>
 	</listener>
 
@@ -210,12 +210,40 @@
 	
 	<security-constraint>
 		<web-resource-collection>
-			<web-resource-name>Secure Content</web-resource-name>
+			<web-resource-name>Sysadmin Content</web-resource-name>
 			<url-pattern>/*</url-pattern>
 			<http-method>GET</http-method>
  			<http-method>POST</http-method>
 		</web-resource-collection>
 		<auth-constraint>
+			<role-name>SYSADMIN</role-name>
+		</auth-constraint>
+	</security-constraint>
+	
+	<security-constraint>
+		<web-resource-collection>
+			<web-resource-name>Group Manager Content</web-resource-name>
+			<url-pattern>/usersearch.do</url-pattern>
+			<url-pattern>/orgmanage.do</url-pattern>
+			<url-pattern>/orgmanage/*</url-pattern>
+			<url-pattern>/organisation/create.do</url-pattern>
+			<url-pattern>/organisation/edit.do</url-pattern>
+			<url-pattern>/orgsave.do</url-pattern>
+			<url-pattern>/usermanage.do</url-pattern>
+			<url-pattern>/userorgsave.do</url-pattern>
+			<url-pattern>/userorg.do</url-pattern>
+			<url-pattern>/userorgrolesave.do</url-pattern>
+			<url-pattern>/userroles.do</url-pattern>
+			<url-pattern>/userrolessave.do</url-pattern>
+			<url-pattern>/user/edit.do</url-pattern>
+			<url-pattern>/user/basiclist.do</url-pattern>
+			<url-pattern>/user/searchsingle.do</url-pattern>
+			<url-pattern>/usersave/saveUserDetails.do</url-pattern>
+			<url-pattern>/css/*</url-pattern>
+			<http-method>GET</http-method>
+ 			<http-method>POST</http-method>
+		</web-resource-collection>
+		<auth-constraint>
 			<role-name>GROUP MANAGER</role-name>
 			<role-name>APPADMIN</role-name>
 		</auth-constraint>