message-admin complete\rweb.xml parses without errors

[mir.git] / etc / web.xml

diff --git a/etc/web.xml b/etc/web.xml
index b028d4f..ab001f7 100755 (executable)
--- a/etc/web.xml
+++ b/etc/web.xml
@@ -6,6 +6,37 @@
 
 <web-app>
        <display-name>Mir CMS</display-name>
+       
+       <filter>
+               <filter-name>caching</filter-name>
+               <filter-class>mir.core.ui.filter.CachingFilter</filter-class>   
+       </filter>
+               
+       <filter>
+               <filter-name>authentication</filter-name>
+               <filter-class>mir.core.ui.filter.AuthenticationFilter</filter-class>    
+       </filter>
+
+       <filter-mapping>
+               <filter-name>caching</filter-name>
+               <servlet-name>action</servlet-name>
+       </filter-mapping>
+               
+    <filter-mapping>
+               <filter-name>caching</filter-name>
+               <servlet-name>presentation</servlet-name>
+       </filter-mapping>       
+       
+       <filter-mapping>
+               <filter-name>authentication</filter-name>
+               <servlet-name>action</servlet-name>
+       </filter-mapping>
+       
+    <filter-mapping>
+               <filter-name>authentication</filter-name>
+               <servlet-name>presentation</servlet-name>
+       </filter-mapping>
+                       
     <servlet>
         <servlet-name>Mir</servlet-name>
         <servlet-class>Mir</servlet-class>
@@ -72,26 +103,7 @@
         <servlet-name>OpenMir</servlet-name>
         <url-pattern>/servlet/OpenMir</url-pattern>
     </servlet-mapping>
-
-       <filter>
-               <filter-name>authentication</filter-name>
-               <filter-class>mir.core.ui.filter.AuthenticationFilter</filter-class>    
-       </filter>
-
-    <filter-mapping>
-               <filter-name>authentication</filter-name>
-               <servlet-name>presentation</servlet-name>
-       </filter-mapping>
-       
-       <filter-mapping>
-               <filter-name>authentication</filter-name>
-               <servlet-name>action</servlet-name>
-       </filter-mapping>       
-       
-       <welcome-file-list>
-               <welcome-file>index.shtml</welcome-file>
-       </welcome-file-list>
-       
+               
     <mime-mapping>
       <extension>
         mp3 
@@ -156,4 +168,8 @@
         application/pdf
       </mime-type>
     </mime-mapping>
+    
+       <welcome-file-list>
+               <welcome-file>index.html</welcome-file>
+       </welcome-file-list>
 </web-app>
\ No newline at end of file