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

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 6eb68dab..763fc1bd 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -4,14 +4,14 @@
   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 -->
 
   <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>
@@ -43,7 +44,7 @@
   <!-- Handles all requests into the application -->
 
   <servlet>
-    <servlet-name>Spring MVC Dispatcher Servlet</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>
@@ -54,16 +55,8 @@
   </servlet>
 
   <servlet-mapping>
-    <servlet-name>Spring MVC Dispatcher Servlet</servlet-name>
-    <url-pattern>*.html</url-pattern>
+    <servlet-name>Dispatcher Servlet - Website</servlet-name>
+    <url-pattern>/</url-pattern>
   </servlet-mapping>
 
-  <error-page>
-    <error-code>404</error-code>
-    <location>/WEB-INF/404.jsp</location>
-  </error-page>
-  <error-page>
-    <location>/WEB-INF/error.jsp</location>
-  </error-page>
-
 </web-app>