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

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index b6cb19fc..af117549 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -6,8 +6,78 @@
 
   <display-name>branding</display-name>
 
+  <!-- Context Configuration locations for Spring XML files -->
+
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>
+      classpath:/spring/mvc.xml
+    </param-value>
+  </context-param>
+
   <listener>
-    <listener-class>org.apache.tiles.web.startup.simple.SimpleTilesListener</listener-class>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
   </listener>
 
+
+  <!-- UTF-8 -->
+
+  <filter>
+    <filter-name>characterEncodingFilter</filter-name>
+    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+    <init-param>
+      <param-name>encoding</param-name>
+      <param-value>UTF-8</param-value>
+    </init-param>
+    <init-param>
+      <param-name>forceEncoding</param-name>
+      <param-value>true</param-value>
+    </init-param>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>characterEncodingFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </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>Dispatcher Servlet - Branding</servlet-name>
+    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+    <init-param>
+      <param-name>contextConfigLocation</param-name>
+      <param-value>
+      </param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <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>