merge 충돌 처리

WebContent/WEB-INF/web.xml

@@ -9,16 +9,7 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>/WEB-INF/applicationContext.xml</param-value>
 	</context-param>
-	<!-- XSS Filter -->	
+	<!-- Encoding Filter (반드시 다른 필터보다 먼저 적용되어야 함) -->
-	<filter>
-		<filter-name>CrossScriptingFilter</filter-name>
-		<filter-class>com.eactive.eai.rms.common.filter.CrossScriptingFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>CrossScriptingFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-  	
 	<filter>
 	    <filter-name>encodingFilter</filter-name>
 	    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
@@ -31,30 +22,20 @@
 	    <param-value>true</param-value>
 	   </init-param>
 	</filter>
+	<!-- encodingFilter를 모든 요청에 먼저 적용 -->
+	<filter-mapping>
+	  <filter-name>encodingFilter</filter-name>
+	  <url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<!-- XSS Filter (encodingFilter 다음에 적용) -->
 	<filter>
-	    <filter-name>encodingFilterEUCKR</filter-name>
+		<filter-name>CrossScriptingFilter</filter-name>
-	    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+		<filter-class>com.eactive.eai.rms.common.filter.CrossScriptingFilter</filter-class>
-	     <init-param>
-	       <param-name>encoding</param-name>
-	       <param-value>utf-8</param-value>
-	   </init-param>
-	   <init-param>
-	       <param-name>forceEncoding</param-name>
-	    <param-value>true</param-value>
-	   </init-param>
 	</filter>
 	<filter-mapping>
-	  <filter-name>encodingFilterEUCKR</filter-name>
+		<filter-name>CrossScriptingFilter</filter-name>
-	  <url-pattern>*.excel</url-pattern>
+		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-	  <filter-name>encodingFilter</filter-name>
-	  <url-pattern>*.file</url-pattern>
-	</filter-mapping>
-	<!-- Tomcat 에서는 필요. Weblogic 에서는 불필요함 -->
-	<filter-mapping>
-	  <filter-name>encodingFilter</filter-name>
-	  <url-pattern>*.json</url-pattern>
 	</filter-mapping>
 
 <!-- 
@@ -168,6 +149,6 @@
 	</jsp-config>
 	
 	<session-config>
-    	    <session-timeout>30</session-timeout>	
+    	    <session-timeout>30</session-timeout>
 	</session-config>
 </web-app>