From 78704fd74cf4f54687985fc4375684a54889cda3 Mon Sep 17 00:00:00 2001 From: Daniel Gerhardt <code@dgerhardt.net> Date: Sat, 21 Jul 2018 11:29:44 +0200 Subject: [PATCH] Get rid of obsolete XML application context config --- src/main/webapp/WEB-INF/arsnova-servlet.xml | 5 ----- src/main/webapp/WEB-INF/web.xml | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/arsnova-servlet.xml diff --git a/src/main/webapp/WEB-INF/arsnova-servlet.xml b/src/main/webapp/WEB-INF/arsnova-servlet.xml deleted file mode 100644 index c467b1038..000000000 --- a/src/main/webapp/WEB-INF/arsnova-servlet.xml +++ /dev/null @@ -1,5 +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" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"> -</beans> diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 038786572..3d024504c 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -22,6 +22,10 @@ <servlet> <servlet-name>arsnova</servlet-name> <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> + <init-param> + <param-name>contextClass</param-name> + <param-value>org.springframework.web.context.support.AnnotationConfigWebApplicationContext</param-value> + </init-param> <init-param> <param-name>throwExceptionIfNoHandlerFound</param-name> <param-value>true</param-value> -- GitLab