From c3f8d59fb016f9d2090769717d7422c879a9c749 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Thu, 9 Apr 2020 20:55:15 +0200
Subject: [PATCH] JAVA-976: Fix spring-security-mvc-login configuration

---
 .../src/test/java/com/baeldung/SpringContextTest.java     | 2 +-
 .../security/RedirectionSecurityIntegrationTest.java      | 2 +-
 .../src/test/resources/mvc-servlet.xml                    | 8 --------
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 spring-security-modules/spring-security-mvc-login/src/test/resources/mvc-servlet.xml

diff --git a/spring-security-modules/spring-security-mvc-login/src/test/java/com/baeldung/SpringContextTest.java b/spring-security-modules/spring-security-mvc-login/src/test/java/com/baeldung/SpringContextTest.java
index 4cf3b736ea..dfc83a40b0 100644
--- a/spring-security-modules/spring-security-mvc-login/src/test/java/com/baeldung/SpringContextTest.java
+++ b/spring-security-modules/spring-security-mvc-login/src/test/java/com/baeldung/SpringContextTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration({ "/RedirectionWebSecurityConfig.xml", "/mvc-servlet.xml" })
+@ContextConfiguration({ "/RedirectionWebSecurityConfig.xml" })
 @WebAppConfiguration
 public class SpringContextTest {
 	@Test
diff --git a/spring-security-modules/spring-security-mvc-login/src/test/java/com/baeldung/security/RedirectionSecurityIntegrationTest.java b/spring-security-modules/spring-security-mvc-login/src/test/java/com/baeldung/security/RedirectionSecurityIntegrationTest.java
index 1235e2e69f..e2b444de20 100644
--- a/spring-security-modules/spring-security-mvc-login/src/test/java/com/baeldung/security/RedirectionSecurityIntegrationTest.java
+++ b/spring-security-modules/spring-security-mvc-login/src/test/java/com/baeldung/security/RedirectionSecurityIntegrationTest.java
@@ -25,7 +25,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration({ "/RedirectionWebSecurityConfig.xml", "/mvc-servlet.xml" })
+@ContextConfiguration({ "/RedirectionWebSecurityConfig.xml" })
 @WebAppConfiguration
 public class RedirectionSecurityIntegrationTest {
 
diff --git a/spring-security-modules/spring-security-mvc-login/src/test/resources/mvc-servlet.xml b/spring-security-modules/spring-security-mvc-login/src/test/resources/mvc-servlet.xml
deleted file mode 100644
index aee837c977..0000000000
--- a/spring-security-modules/spring-security-mvc-login/src/test/resources/mvc-servlet.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
-    <context:component-scan base-package="com.baeldung.controller" />
-
-</beans>
\ No newline at end of file