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

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index af117549..763fc1bd 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -4,7 +4,7 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
   version="2.5">
 
-  <display-name>branding</display-name>
+  <display-name>website</display-name>
 
   <!-- Context Configuration locations for Spring XML files -->
 
@@ -41,23 +41,10 @@
   </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-name>Dispatcher Servlet - Website</servlet-name>
     <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
     <init-param>
       <param-name>contextConfigLocation</param-name>
@@ -68,16 +55,8 @@
   </servlet>
 
   <servlet-mapping>
-    <servlet-name>Dispatcher Servlet - Branding</servlet-name>
+    <servlet-name>Dispatcher Servlet - Website</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>