From a59168b67fe9fd0e8e46236104d19b671dcecd01 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Thu, 23 May 2019 12:37:11 +0530
Subject: [PATCH] [BAEL-14777] - Removed old spring 4 and xml related settings

---
 .../org/baeldung/config/child/WebConfig.java  |  2 -
 .../config/parent/SecurityConfig.java         |  1 -
 .../src/main/resources/prop.xml               | 13 -----
 .../src/main/resources/webSecurityConfig.xml  | 21 --------
 .../src/main/webapp/WEB-INF/web_old.xml       | 51 -------------------
 5 files changed, 88 deletions(-)
 delete mode 100644 spring-security-rest-custom/src/main/resources/prop.xml
 delete mode 100644 spring-security-rest-custom/src/main/resources/webSecurityConfig.xml
 delete mode 100644 spring-security-rest-custom/src/main/webapp/WEB-INF/web_old.xml

diff --git a/spring-security-rest-custom/src/main/java/org/baeldung/config/child/WebConfig.java b/spring-security-rest-custom/src/main/java/org/baeldung/config/child/WebConfig.java
index d7b2da6fe7..6688d41ffa 100644
--- a/spring-security-rest-custom/src/main/java/org/baeldung/config/child/WebConfig.java
+++ b/spring-security-rest-custom/src/main/java/org/baeldung/config/child/WebConfig.java
@@ -14,8 +14,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 @EnableWebMvc
 @ComponentScan("org.baeldung.web")
-// @ImportResource({ "classpath:prop.xml" })
-// @PropertySource("classpath:foo.properties")
 public class WebConfig implements WebMvcConfigurer {
 
     public WebConfig() {
diff --git a/spring-security-rest-custom/src/main/java/org/baeldung/config/parent/SecurityConfig.java b/spring-security-rest-custom/src/main/java/org/baeldung/config/parent/SecurityConfig.java
index 616c2a7684..74e2df2174 100644
--- a/spring-security-rest-custom/src/main/java/org/baeldung/config/parent/SecurityConfig.java
+++ b/spring-security-rest-custom/src/main/java/org/baeldung/config/parent/SecurityConfig.java
@@ -10,7 +10,6 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 @Configuration
-// @ImportResource({ "classpath:webSecurityConfig.xml" })
 @EnableWebSecurity
 @ComponentScan("org.baeldung.security")
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
diff --git a/spring-security-rest-custom/src/main/resources/prop.xml b/spring-security-rest-custom/src/main/resources/prop.xml
deleted file mode 100644
index b853d939d6..0000000000
--- a/spring-security-rest-custom/src/main/resources/prop.xml
+++ /dev/null
@@ -1,13 +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
-      http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
-      http://www.springframework.org/schema/context
-      http://www.springframework.org/schema/context/spring-context-4.2.xsd">
- 
-      <context:property-placeholder location="classpath:foo.properties" />
- 
-</beans>
\ No newline at end of file
diff --git a/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml b/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml
deleted file mode 100644
index fa5dc894bf..0000000000
--- a/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/security 
-        http://www.springframework.org/schema/security/spring-security-4.2.xsd
-        http://www.springframework.org/schema/beans 
-        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"
->
-
-    <http use-expressions="true">
-        <intercept-url pattern="/**" access="isAuthenticated()"/>
-
-        <http-basic/>
-
-    </http>
-
-    <authentication-manager>
-        <authentication-provider ref="customAuthenticationProvider"/>
-    </authentication-manager>
-
-</beans:beans>
\ No newline at end of file
diff --git a/spring-security-rest-custom/src/main/webapp/WEB-INF/web_old.xml b/spring-security-rest-custom/src/main/webapp/WEB-INF/web_old.xml
deleted file mode 100644
index 0fa9abd258..0000000000
--- a/spring-security-rest-custom/src/main/webapp/WEB-INF/web_old.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-    xsi:schemaLocation="
-      http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
->
-
-    <display-name>Spring Security Custom Application</display-name>
-
-    <!-- Spring root -->
-    <context-param>
-        <param-name>contextClass</param-name>
-        <param-value>
-         org.springframework.web.context.support.AnnotationConfigWebApplicationContext
-      </param-value>
-    </context-param>
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.config.parent</param-value>
-    </context-param>
-
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
-
-    <!-- Spring child -->
-    <servlet>
-        <servlet-name>api</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <!-- <init-param> -->
-        <!-- <param-name>contextConfigLocation</param-name> -->
-        <!-- <param-value>org.baeldung.config.child</param-value> -->
-        <!-- </init-param> -->
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>api</servlet-name>
-        <url-pattern>/api/*</url-pattern>
-    </servlet-mapping>
-
-    <!-- Spring Security -->
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-</web-app>
\ No newline at end of file