From ba9b4bfdebb4b68acec29dfd856a02f361d7f532 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Mon, 25 Feb 2019 18:24:54 +0100
Subject: [PATCH] OO-3911: add custom error pages for 400-417 and 500-505 error
 codes

---
 src/main/webapp-tomcat/WEB-INF/web.xml  | 96 ++++++++++++++++++++++++-
 src/main/webapp-wildfly/WEB-INF/web.xml | 95 +++++++++++++++++++++++-
 2 files changed, 187 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp-tomcat/WEB-INF/web.xml b/src/main/webapp-tomcat/WEB-INF/web.xml
index e27c91a2ba4..4cf6b2a280d 100644
--- a/src/main/webapp-tomcat/WEB-INF/web.xml
+++ b/src/main/webapp-tomcat/WEB-INF/web.xml
@@ -108,7 +108,7 @@
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	
-	<!-- Jersey REST Servlet -->
+	<!-- Apache CXF Servlet -->
 	<servlet>
         <servlet-name>RESTServletAdaptor</servlet-name>
         <display-name>CXF Servlet</display-name>
@@ -187,10 +187,102 @@
 	<session-config>
 		<session-timeout>60</session-timeout>
     </session-config>
-    
+ 	
+ 	<error-page>
+		<error-code>400</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>401</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>402</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>403</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>404</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>405</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>406</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>407</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>408</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>409</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>410</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>411</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>412</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>413</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>414</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>415</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>416</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>417</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
 	<error-page>
 		<error-code>500</error-code>
     	<location>/errors/error.html</location>
+    </error-page>
+	<error-page>
+		<error-code>501</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+	<error-page>
+		<error-code>502</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+	<error-page>
+		<error-code>503</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+	<error-page>
+		<error-code>504</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+	<error-page>
+		<error-code>505</error-code>
+    	<location>/errors/error.html</location>
     </error-page>
     <error-page>
     	<exception-type>java.lang.Throwable</exception-type>
diff --git a/src/main/webapp-wildfly/WEB-INF/web.xml b/src/main/webapp-wildfly/WEB-INF/web.xml
index 28a461990f9..70be51a244a 100644
--- a/src/main/webapp-wildfly/WEB-INF/web.xml
+++ b/src/main/webapp-wildfly/WEB-INF/web.xml
@@ -158,16 +158,107 @@
 		<url-pattern>/ical/*</url-pattern>
   	</servlet-mapping><!-- Spring loading -->
 
-
 	<!-- 6. Session-Config -->
 	<!-- default session timeout -->
 	<session-config>
 		<session-timeout>60</session-timeout>
     </session-config>
-
+ 	
+ 	<error-page>
+		<error-code>400</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>401</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>402</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>403</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>404</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>405</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>406</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>407</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>408</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>409</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>410</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>411</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>412</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>413</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>414</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>415</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>416</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+ 	<error-page>
+		<error-code>417</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
 	<error-page>
 		<error-code>500</error-code>
     	<location>/errors/error.html</location>
+    </error-page>
+	<error-page>
+		<error-code>501</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+	<error-page>
+		<error-code>502</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+	<error-page>
+		<error-code>503</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+	<error-page>
+		<error-code>504</error-code>
+    	<location>/errors/error.html</location>
+    </error-page>
+	<error-page>
+		<error-code>505</error-code>
+    	<location>/errors/error.html</location>
     </error-page>
     <error-page>
     	<exception-type>java.lang.Throwable</exception-type>
-- 
GitLab