From 57b66fa5788ff711f92716540f87205a1af38f80 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Sun, 13 Sep 2020 21:40:14 +0200
Subject: [PATCH] JAVA-2404: Fix Spring MVC and Security config

---
 .../java/com/baeldung/spring/WebConfig.java   |  2 +-
 .../src/main/webapp/WEB-INF/web.xml           | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/spring-security-modules/spring-security-web-rest/src/main/java/com/baeldung/spring/WebConfig.java b/spring-security-modules/spring-security-web-rest/src/main/java/com/baeldung/spring/WebConfig.java
index 84b211a9bd..76e9abdbdb 100644
--- a/spring-security-modules/spring-security-web-rest/src/main/java/com/baeldung/spring/WebConfig.java
+++ b/spring-security-modules/spring-security-web-rest/src/main/java/com/baeldung/spring/WebConfig.java
@@ -12,7 +12,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
 @Configuration
-@ComponentScan("com.baeldung.web")
+@ComponentScan("com.baeldung")
 @EnableWebMvc
 @EnableAsync
 public class WebConfig implements WebMvcConfigurer  {
diff --git a/spring-security-modules/spring-security-web-rest/src/main/webapp/WEB-INF/web.xml b/spring-security-modules/spring-security-web-rest/src/main/webapp/WEB-INF/web.xml
index 663c17bc56..6321277c5b 100644
--- a/spring-security-modules/spring-security-web-rest/src/main/webapp/WEB-INF/web.xml
+++ b/spring-security-modules/spring-security-web-rest/src/main/webapp/WEB-INF/web.xml
@@ -20,9 +20,9 @@
 		<param-value>com.baeldung.spring</param-value>
 	</context-param>
 
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
+<!--	<listener>-->
+<!--		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>-->
+<!--	</listener>-->
 
 	<!-- Spring child -->
 	<servlet>
@@ -40,17 +40,17 @@
 	</servlet-mapping>
 
 	<!-- Spring Security -->
-	<filter>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-		<async-supported>true</async-supported>
-	</filter>
-	<filter-mapping>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<url-pattern>/*</url-pattern>
-		<dispatcher>REQUEST</dispatcher>
-   	    <dispatcher>ASYNC</dispatcher>
-	</filter-mapping>
+<!--	<filter>-->
+<!--		<filter-name>springSecurityFilterChain</filter-name>-->
+<!--		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>-->
+<!--		<async-supported>true</async-supported>-->
+<!--	</filter>-->
+<!--	<filter-mapping>-->
+<!--		<filter-name>springSecurityFilterChain</filter-name>-->
+<!--		<url-pattern>/*</url-pattern>-->
+<!--		<dispatcher>REQUEST</dispatcher>-->
+<!--   	    <dispatcher>ASYNC</dispatcher>-->
+<!--	</filter-mapping>-->
 
 	<!-- <welcome-file-list> -->
 	<!-- <welcome-file>index.html</welcome-file> -->