X-Git-Url: https://juplo.de/gitweb/?p=website;a=blobdiff_plain;f=src%2Fmain%2Fwebapp%2FWEB-INF%2Fweb.xml;h=af117549c30208bd0c9fd49085faaee117c8cf95;hp=3be0c17c3c0a102cd96a3145a4263cadb630c5e1;hb=b8b2fc094d0313626224371dcbdf18784d56d51f;hpb=d53a4e6b1196f66f6f1768c013a4d9759be70dd2

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 3be0c17c..af117549 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -11,7 +11,7 @@
   <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>
-      /WEB-INF/spring/mvc.xml
+      classpath:/spring/mvc.xml
     </param-value>
   </context-param>
 
@@ -21,6 +21,7 @@
 
 
   <!-- UTF-8 -->
+
   <filter>
     <filter-name>characterEncodingFilter</filter-name>
     <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
@@ -40,10 +41,23 @@
   </filter-mapping>
 
 
+  <!-- Fix a logic-bug in the colaboration of Thymeleaf and Tiles -->
+
+  <filter>
+    <filter-name>forceIncludeFilter</filter-name>
+    <filter-class>de.juplo.branding.web.ForceIncludeFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>forceIncludeFilter</filter-name>
+    <url-pattern>*.html</url-pattern>
+  </filter-mapping>
+
+
   <!-- Handles all requests into the application -->
 
   <servlet>
-    <servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
+    <servlet-name>Dispatcher Servlet - Branding</servlet-name>
     <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
     <init-param>
       <param-name>contextConfigLocation</param-name>
@@ -54,8 +68,16 @@
   </servlet>
 
   <servlet-mapping>
-    <servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
-    <url-pattern>*.html</url-pattern>
+    <servlet-name>Dispatcher Servlet - Branding</servlet-name>
+    <url-pattern>/</url-pattern>
   </servlet-mapping>
 
+  <error-page>
+    <error-code>404</error-code>
+    <location>/404.html</location>
+  </error-page>
+  <error-page>
+    <location>/error.html</location>
+  </error-page>
+
 </web-app>