From 198954f9257a4ec9984ea8766e216b85733a8c0f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 18 Feb 2019 08:25:37 +0100
Subject: use UTF-8 servlet-filter instead of encoding information

---
 id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml | 33 +++++++++---------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml')

diff --git a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml
index 4118c94f4..b94368ac6 100644
--- a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml
+++ b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml
@@ -27,17 +27,6 @@
 			<param-value>^.*((/index.action.*)|(/error.action.*)|(/authenticate.action.*)|(/pvp2login.action.*)|(/mailAddressVerification.action.*)|(/logout.action)|(/jsp/.*)|(/css/.*)|(/servlet/.*)|(/images/.*)|(/js/.*))$</param-value>
 		</init-param>
 	</filter>
-	<filter-mapping>
-		<filter-name>AuthenicationFiler</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-	
-	
-<!--   	
- 	<filter>
-	    <filter-name>sitemash</filter-name>
-	    <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
-	</filter> -->
 	 	
 	<filter>
 		<filter-name>struts2</filter-name>
@@ -105,21 +94,23 @@
 		<url-pattern>/servlet/sloBackChannel</url-pattern>
 	</servlet-mapping>
    
-<!--  	<filter-mapping>
-	    <filter-name>sitemash</filter-name>
-	    <url-pattern>/*</url-pattern>
-	</filter-mapping> -->
-	
+
+<!-- Set filter order -->
   <filter-mapping>
-		<filter-name>struts2</filter-name>
-		<url-pattern>*.action</url-pattern>
+		<filter-name>AuthenicationFiler</filter-name>
+		<url-pattern>/*</url-pattern>
   </filter-mapping>
-  
+
   <filter-mapping>
 		<filter-name>EncodingFilter</filter-name>
 		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-  	
+  </filter-mapping>
+	
+  <filter-mapping>
+		<filter-name>struts2</filter-name>
+		<url-pattern>*.action</url-pattern>
+  </filter-mapping>
+    	
  	<session-config>
     <session-timeout>45</session-timeout>
   </session-config>  	
-- 
cgit v1.2.3