Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r67971954b8537811d7f3497041713d98412b1680 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 67971954b8537811d7f3497041713d98412b1680)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -10,38 +10,7 @@
 		</param-value>
 	</context-param>
 
-	<!-- In LAMS 2.3 there was a change in this section in all tools and core 
-		parts (central, learning, monitoring etc.) All LAMS web application now use 
-		shared application context. See refBeanContext.xml file in lams_common for 
-		its description. This refBeanContext.xml contains definition of the shared 
-		context. It is located by this entry: <context-param> <param-name>locatorFactorySelector</param-name> 
-		<param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value> 
-		</context-param> telling to look for refBeanContext.xml files in selected 
-		part of the classpath. Currently LAMS has only one refBeanContext.xml with 
-		one shared context definition. Lams_central uses only beans from the shared 
-		context "context.central". That is why there is no value in contextConfigLocation. 
-		Even so, this parameter needs to be declared with empty value for locatorFactorySelector 
-		to work properly. Also, if no local application context file is declare, 
-		there MUST be a file named "applicationContext.xml" in web/WEB-INF containing 
-		empty bean list, otherwise there will be errors during start up. If there 
-		are local (private for web application; see tools and admin for example) 
-		bean definitions, path to application context XML file can still be added 
-		to contextConfigLocation. -->
-
 	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<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>
-	<context-param>
         <param-name>Owasp.CsrfGuard.Config</param-name>
         <param-value>WEB-INF/Owasp.CsrfGuard.properties</param-value>
     </context-param>
@@ -176,7 +145,7 @@
 
 	<listener>
 		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
+			org.lamsfoundation.lams.web.filter.LamsContextLoaderListener
 		</listener-class>
 	</listener>
 
@@ -624,7 +593,7 @@
 			<role-name>MONITOR</role-name>
 			<role-name>AUTHOR</role-name>
 			<role-name>GROUP MANAGER</role-name>
-			<role-name>SYSADMIN</role-name>
+			<role-name>APPADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
 	<security-constraint>
@@ -659,8 +628,8 @@
 			<url-pattern>/images/*</url-pattern>
 			<url-pattern>/includes/javascript/*</url-pattern>
 			<url-pattern>/includes/font-awesome/*</url-pattern>
+			<url-pattern>/includes/font-awesome6/*</url-pattern>
 			<url-pattern>/ckeditor/*</url-pattern>
-			<url-pattern>/loadVars.jsp</url-pattern>
 			<url-pattern>/favicon.ico</url-pattern>
 			<http-method>GET</http-method>
  			<http-method>POST</http-method>
@@ -677,15 +646,15 @@
 		</web-resource-collection>
 		<auth-constraint>
 			<role-name>AUTHOR</role-name>
-			<role-name>SYSADMIN</role-name>
+			<role-name>APPADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
 
 	<!-- Some constraints are based on DisplayGroupAction class -->
 	<security-constraint>
 		<web-resource-collection>
 			<web-resource-name>Any superuser content</web-resource-name>
-			<url-pattern>/orgGroup.jsp</url-pattern>
+			<url-pattern>/groups.jsp</url-pattern>
 			<url-pattern>/orgGrouping.jsp</url-pattern>
 			<url-pattern>/qb/collection/*</url-pattern>
 			<url-pattern>/qb/stats/*</url-pattern>
@@ -698,7 +667,7 @@
 			<role-name>AUTHOR</role-name>
 			<role-name>MONITOR</role-name>
 			<role-name>GROUP MANAGER</role-name>
-			<role-name>SYSADMIN</role-name>
+			<role-name>APPADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
 	<security-constraint>
@@ -712,19 +681,19 @@
 		<auth-constraint>
 			<role-name>MONITOR</role-name>
 			<role-name>GROUP MANAGER</role-name>
-			<role-name>SYSADMIN</role-name>
+			<role-name>APPADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
 	<security-constraint>
 		<web-resource-collection>
-			<web-resource-name>Sysadmin content</web-resource-name>
+			<web-resource-name>Appadmin content</web-resource-name>
 			<url-pattern>/admin.jsp</url-pattern>
-			<url-pattern>/sysadmin.jsp</url-pattern>
+			<url-pattern>/appadmin.jsp</url-pattern>
 			<http-method>GET</http-method>
  			<http-method>POST</http-method>
 		</web-resource-collection>
 		<auth-constraint>
-			<role-name>SYSADMIN</role-name>
+			<role-name>APPADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
 
@@ -759,7 +728,7 @@
 		<role-name>GROUP MANAGER</role-name>
 	</security-role>
 	<security-role>
-		<description>LAMS System Adminstrator</description>
-		<role-name>SYSADMIN</role-name>
+		<description>LAMS Application Adminstrator</description>
+		<role-name>APPADMIN</role-name>
 	</security-role>
-</web-app>
\ No newline at end of file
+</web-app>