-
Type:
Improvement
-
Status: Closed (View Workflow)
-
Priority:
Major
-
Resolution: Fixed
-
Affects Version/s: 10.4.11
-
Fix Version/s: 10.5
-
Component/s: None
-
Labels:None
-
Funded by:
The web.xml should be updated. The mime-mappings are obsolete and part of tomcat/conf.web.xml in the meanwhile.
The <load-on-startup> element has to follow <init-param> (see http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/web-common_3_1.xsd).
diff --git a/src/main/webapp-tomcat/WEB-INF/web.xml b/src/main/webapp-tomcat/WEB-INF/web.xml
--- a/src/main/webapp-tomcat/WEB-INF/web.xml
+++ b/src/main/webapp-tomcat/WEB-INF/web.xml
@@ -189,10 +189,10 @@
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.olat.restapi.support.OlatRestApplication</param-value>
</init-param>
+ <load-on-startup>1</load-on-startup>
<multipart-config>
- <file-size-threshold>10240</file-size-threshold>
- </multipart-config>
- <load-on-startup>1</load-on-startup>
+ <file-size-threshold>10240</file-size-threshold>
+ </multipart-config>
</servlet>
<!-- RSS feed requests -->
@@ -266,48 +266,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>
