Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -rb935721d25817b83c29d3166a7fa9b4b9b7d3785 -r1beaa4cc5e224dd433297d543c5511234c0bfc10
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision b935721d25817b83c29d3166a7fa9b4b9b7d3785)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 1beaa4cc5e224dd433297d543c5511234c0bfc10)
@@ -37,7 +37,6 @@
 			org.lamsfoundation.lams.web.session.SystemSessionFilter
 		</filter-class>
 	</filter>
-
 	<filter>
 		<filter-name>hibernateFilter</filter-name>
 		<filter-class>
@@ -48,13 +47,16 @@
 			<param-value>coreSessionFactory</param-value>
 		</init-param>
 	</filter>
-
 	<filter>
 		<filter-name>LocaleFilter</filter-name>
 		<filter-class>
 			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>SystemSessionFilter</filter-name>
@@ -70,6 +72,10 @@
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
+	<filter-mapping>
+		<filter-name>CSRFGuard</filter-name> 
+		<url-pattern>*.do</url-pattern>
+	</filter-mapping>
 
 	<listener>
 		<listener-class>
@@ -171,7 +177,6 @@
 			<taglib-uri>tags-xml</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/jstl/x.tld</taglib-location>
 		</taglib>
-
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library: Apache implementation of TLV -->
 		<!-- ======================================================== -->
@@ -184,15 +189,20 @@
 			<taglib-uri>tags-scriptfree</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/jstl/scriptfree.tld</taglib-location>
 		</taglib>
-
 		<!-- ======================================================== -->
 		<!-- Customized Tag Library -->
 		<!-- ======================================================== -->
-
 		<taglib>
 			<taglib-uri>tags-lams</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/lams/lams.tld</taglib-location>
 		</taglib>
+		<!-- ======================================================== -->
+		<!-- CSRF Guard Tag Library -->
+		<!-- ======================================================== -->
+		<taglib>
+			<taglib-uri>csrfguard</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
+		</taglib>
 
 	</jsp-config>