diff --git a/src/main/webapp-tomcat/WEB-INF/web.xml b/src/main/webapp-tomcat/WEB-INF/web.xml
index e27c91a2ba42888f4816e636a29657b2278e0327..4cf6b2a280d267b522bfee9e8956dea8edc754a6 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 28a461990f9cf7b9594687480ac5524222d384bb..70be51a244a1183a3d881a01762f44942d3f9c0c 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>