Index: lams_build/build.xml
===================================================================
diff -u -rc5a709e4cb42d0729ad3fbd814714fb27dd844df -r24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4
--- lams_build/build.xml	(.../build.xml)	(revision c5a709e4cb42d0729ad3fbd814714fb27dd844df)
+++ lams_build/build.xml	(.../build.xml)	(revision 24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4)
@@ -418,14 +418,6 @@
 		<copy tofile="${server.home}/modules/system/layers/base/org/apache/batik/main/module.xml"
 			file="lib/batik/batik.module.xml" overwrite="true" verbose="true" />
 		
-		<copy todir="${server.home}/modules/system/layers/base/org/owasp/csrfguard/main" overwrite="true" verbose="true">
-			<fileset dir="lib/csrfguard">
-				<include name="csrfguard-*.jar" />
-			</fileset>
-		</copy>
-		<copy tofile="${server.home}/modules/system/layers/base/org/owasp/csrfguard/main/module.xml"
-			file="lib/csrfguard/csrf.module.xml" overwrite="true" verbose="true" />
-		
 		<copy todir="${server.home}/modules/system/layers/base/org/imsglobal/main" overwrite="true" verbose="true">
 			<fileset dir="lib/basiclti-util">
 				<include name="basiclti-util-*.jar" />
Index: lams_build/build_base.xml
===================================================================
diff -u -rc5a709e4cb42d0729ad3fbd814714fb27dd844df -r24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4
--- lams_build/build_base.xml	(.../build_base.xml)	(revision c5a709e4cb42d0729ad3fbd814714fb27dd844df)
+++ lams_build/build_base.xml	(.../build_base.xml)	(revision 24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4)
@@ -366,13 +366,6 @@
 				<include name="**/*"/>
 			</fileset>
 	 	</copy>
-		
-		<echo>${ant.project.name}: Copying additional property files</echo>
-	 	<copy todir="${basedir}/build/war/WEB-INF" flatten="true" verbose="true">
-			<fileset dir="${basedir}/conf/security" erroronmissingdir="false">
-				<include name="*.properties"/>
-			</fileset>
-	 	</copy>
 	</target>
 	
 	<target name="_copy-deployment-handler">
Index: lams_build/conf/j2ee/jboss-deployment-structure.xml
===================================================================
diff -u -rc5a709e4cb42d0729ad3fbd814714fb27dd844df -r24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4
--- lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision c5a709e4cb42d0729ad3fbd814714fb27dd844df)
+++ lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision 24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4)
@@ -51,7 +51,6 @@
       <module name="com.fasterxml.jackson.core.jackson-databind" export="true" />
       <module name="io.jsonwebtoken" export="true" />
       <module name="org.apache.batik" export="true" />
-      <module name="org.owasp.csrfguard" export="true" />
       
       <!-- Import META-INF/services for ServiceLoader impls as well
       <module name="myservicemodule" services="import"/>
Fisheye: Tag 24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4 refers to a dead (removed) revision in file `lams_build/lib/csrfguard/csrf.module.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
===================================================================
diff -u -rc5a709e4cb42d0729ad3fbd814714fb27dd844df -r24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4
Binary files differ
Index: lams_central/build.xml
===================================================================
diff -u -rc5a709e4cb42d0729ad3fbd814714fb27dd844df -r24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4
--- lams_central/build.xml	(.../build.xml)	(revision c5a709e4cb42d0729ad3fbd814714fb27dd844df)
+++ lams_central/build.xml	(.../build.xml)	(revision 24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4)
@@ -32,13 +32,6 @@
 				<include name="**/*.ico"/>
 			</fileset>
 		</copy>
-		
-		<echo>${ant.project.name}: Copying additional property files</echo>
-	 	<copy todir="${basedir}/build/war/WEB-INF" flatten="true" verbose="true">
-			<fileset dir="${basedir}/conf/security" erroronmissingdir="false">
-				<include name="*.properties"/>
-			</fileset>
-	 	</copy>
 	</target>
 	
 	<target name="_copy-jsp" depends="sass.compile, _js-minify">
Fisheye: Tag 24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4 refers to a dead (removed) revision in file `lams_central/conf/security/Owasp.CsrfGuard.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/tlds/security/csrfguard.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -rc5a709e4cb42d0729ad3fbd814714fb27dd844df -r24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision c5a709e4cb42d0729ad3fbd814714fb27dd844df)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4)
@@ -41,14 +41,6 @@
 		<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>
-    <context-param>
-        <param-name>Owasp.CsrfGuard.Config.Print</param-name>
-        <param-value>true</param-value>
-    </context-param>
 
 	<filter>
 		<filter-name>UrlRewriteFilter</filter-name>
@@ -77,10 +69,6 @@
 			org.lamsfoundation.lams.web.filter.LocaleFilter
 		</filter-class>
 	</filter>
-	<filter>
-		<filter-name>CSRFGuard</filter-name>
-		<filter-class>org.owasp.csrfguard.CsrfGuardFilter</filter-class>
-	</filter>
 
 	<filter-mapping>
 		<filter-name>UrlRewriteFilter</filter-name>
@@ -159,12 +147,7 @@
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>/ckeditor/*</url-pattern>
 	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CSRFGuard</filter-name> 
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-
+	
 	<listener>
 		<listener-class>
 			org.springframework.web.context.ContextLoaderListener
@@ -177,13 +160,6 @@
 		</listener-class>
 	</listener>
 
-	<listener>
-        <listener-class>org.owasp.csrfguard.CsrfGuardServletContextListener</listener-class>
-    </listener>
-     <listener>
-        <listener-class>org.owasp.csrfguard.CsrfGuardHttpSessionListener</listener-class>
-    </listener>
-
 	<servlet>
 		<servlet-name>GetRecordingServlet</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.webservice.GetRecordingServlet
@@ -521,9 +497,6 @@
 		<url-pattern>/services/SPEnrolment</url-pattern>
 	</servlet-mapping>
 	
-
-	
-	
 	<mime-mapping>
 		<extension>csv</extension>
 		<mime-type>text/plain</mime-type>
@@ -587,11 +560,6 @@
 			<taglib-uri>tags-lams</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/lams/lams.tld</taglib-location>
 		</taglib>
-		
-		<taglib>
-			<taglib-uri>csrfguard</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
-		</taglib>
 
 	</jsp-config>
 
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -rc5a709e4cb42d0729ad3fbd814714fb27dd844df -r24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision c5a709e4cb42d0729ad3fbd814714fb27dd844df)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4)
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
-<%@ taglib uri="csrfguard" prefix="csrf" %> 
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
@@ -46,7 +45,6 @@
 
 <body>
 	<form:form action="/lams/saveprofile.do" modelAttribute='newForm' method="post" id='newForm'>
-	  	<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 		<input type="hidden" name="editNameOnly" value="${editOnlyName}" />
 
 		<lams:errors path="*"/>