diff --git a/src/main/webapp-tomcat/WEB-INF/web.xml b/src/main/webapp-tomcat/WEB-INF/web.xml
index 5d71317fb3a912c759c6f806c2eee1084d655671..760b48ba8e564c00f5bd43af505990eaa2a8630b 100644
--- a/src/main/webapp-tomcat/WEB-INF/web.xml
+++ b/src/main/webapp-tomcat/WEB-INF/web.xml
@@ -23,9 +23,6 @@
<param-name>contextConfigLocation</param-name>
<param-value>
classpath:/org/olat/_spring/mainContext.xml
- <!-- OLAT spring config can be loaded with wildcards as it is not packed as jars. This means you do not have to
- add your spring file here manually if it ends with *Context.xml (first letter uppercase!)
- classpath*:**/_spring/*Context.xml -->
</param-value>
</context-param>
@@ -55,13 +52,6 @@
<filter-class>org.olat.restapi.security.RestApiLoginFilter</filter-class>
</filter>
- <!--
- <filter>
- <filter-name>SpyFilter</filter-name>
- <filter-class>org.olat.core.servlets.SpyFilter</filter-class>
- </filter>
- -->
-
<!-- Use FakeHTTPSFilter for requests to WSService and TraineeStatusService (dynamic WSDL for ONYX) -->
<filter-mapping>
<filter-name>OnyxHttpsFilter</filter-name>
@@ -87,12 +77,7 @@
<filter-name>RESTApiLoginFilter</filter-name>
<url-pattern>/restapi/*</url-pattern>
</filter-mapping>
- <!--
- <filter-mapping>
- <filter-name>SpyFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- -->
+
<!-- 3. Listeners -->
<listener>
@@ -189,10 +174,10 @@
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.olat.restapi.support.OlatRestApplication</param-value>
</init-param>
- <multipart-config>
- <file-size-threshold>10240</file-size-threshold>
- </multipart-config>
<load-on-startup>1</load-on-startup>
+ <multipart-config>
+ <file-size-threshold>10240</file-size-threshold>
+ </multipart-config>
</servlet>
<!-- RSS feed requests -->
@@ -266,48 +251,5 @@
<session-config>
<session-timeout>60</session-timeout>
</session-config>
-
-
- <!-- Additional MIME mappings -->
- <mime-mapping>
- <extension>ppt</extension>
- <mime-type>application/vnd.ms-powerpoint</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pps</extension>
- <mime-type>application/vnd.ms-powerpoint</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xls</extension>
- <mime-type>application/vnd.ms-excel</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xlt</extension>
- <mime-type>application/vnd.ms-excel</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xla</extension>
- <mime-type>application/vnd.ms-excel</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>flv</extension>
- <mime-type>video/x-flv</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>f4v</extension>
- <mime-type>video/x-flv</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>aac</extension>
- <mime-type>audio/x-aac</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>m4a</extension>
- <mime-type>audio/x-m4a</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>m4v</extension>
- <mime-type>video/x-m4v</mime-type>
- </mime-mapping>
</web-app>
diff --git a/src/main/webapp-wildfly/WEB-INF/web.xml b/src/main/webapp-wildfly/WEB-INF/web.xml
index 70058c0b36d4ea9a8787bd31bb3b56914e08d163..46eac91f6a09ed7aeb517e82c5753cd97d4f9649 100644
--- a/src/main/webapp-wildfly/WEB-INF/web.xml
+++ b/src/main/webapp-wildfly/WEB-INF/web.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5"
- xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1"
metadata-complete="true">
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
@@ -34,9 +35,7 @@
<param-name>contextInitializerClasses</param-name>
<param-value>org.olat.core.CoreSpringInitializer</param-value>
</context-param>
-
-
<!-- 2. Filters -->
<filter>
<filter-name>OnyxHttpsFilter</filter-name>
@@ -187,48 +186,5 @@
<session-config>
<session-timeout>60</session-timeout>
</session-config>
-
-
- <!-- Additional MIME mappings -->
- <mime-mapping>
- <extension>ppt</extension>
- <mime-type>application/vnd.ms-powerpoint</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pps</extension>
- <mime-type>application/vnd.ms-powerpoint</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xls</extension>
- <mime-type>application/vnd.ms-excel</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xlt</extension>
- <mime-type>application/vnd.ms-excel</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xla</extension>
- <mime-type>application/vnd.ms-excel</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>flv</extension>
- <mime-type>video/x-flv</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>f4v</extension>
- <mime-type>video/x-flv</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>aac</extension>
- <mime-type>audio/x-aac</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>m4a</extension>
- <mime-type>audio/x-m4a</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>m4v</extension>
- <mime-type>video/x-m4v</mime-type>
- </mime-mapping>
</web-app>