From 8c953fe0f3c15ed8ff128dfe76978c565529e259 Mon Sep 17 00:00:00 2001 From: michal_aibin Date: Fri, 4 Nov 2016 22:23:17 +0100 Subject: [PATCH 1/3] Fix web.xml in spring-mvc-web-vs-initializer project --- spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml b/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml index 9bebc263be..5c7a0b52d4 100644 --- a/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml +++ b/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml @@ -9,11 +9,11 @@ org.springframework.web.servlet.DispatcherServlet - 1 contextConfigLocation classpath*:mvc-configuration.xml + 1 From 90783532a5e91be0592fbf684733719b766ed0a0 Mon Sep 17 00:00:00 2001 From: michal_aibin Date: Fri, 4 Nov 2016 22:42:20 +0100 Subject: [PATCH 2/3] Rollback web.xml --- spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml b/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml index 5c7a0b52d4..9bebc263be 100644 --- a/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml +++ b/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml @@ -9,11 +9,11 @@ org.springframework.web.servlet.DispatcherServlet + 1 contextConfigLocation classpath*:mvc-configuration.xml - 1 From d6363949475c8fbf784cc30d96bdcaf7969a12f7 Mon Sep 17 00:00:00 2001 From: michal_aibin Date: Fri, 4 Nov 2016 22:47:09 +0100 Subject: [PATCH 3/3] Fix web.xml file --- spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml b/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml index 9bebc263be..5c7a0b52d4 100644 --- a/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml +++ b/spring-mvc-web-vs-initializer/src/main/webapp/WEB-INF/web.xml @@ -9,11 +9,11 @@ org.springframework.web.servlet.DispatcherServlet - 1 contextConfigLocation classpath*:mvc-configuration.xml + 1