next steps in itegrating struts and hibernate.\rlogin and logout ist now possible...

[mir.git] / etc / web.xml

diff --git a/etc/web.xml b/etc/web.xml
index db47a25..b028d4f 100755 (executable)
--- a/etc/web.xml
+++ b/etc/web.xml
@@ -1,84 +1,75 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3 //EN"
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
     "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app>
+       <display-name>Mir CMS</display-name>
+    <servlet>
+        <servlet-name>Mir</servlet-name>
+        <servlet-class>Mir</servlet-class>
+        <init-param>
+            <param-name>Config</param-name>
+            <param-value>etc/config.properties</param-value>
+        </init-param>
+    </servlet>
 
+    <servlet>
+        <servlet-name>OpenMir</servlet-name>
+        <servlet-class>OpenMir</servlet-class>
+        <init-param>
+            <param-name>Config</param-name>
+            <param-value>etc/config.properties</param-value>
+        </init-param>
+    </servlet>
+       
        <servlet>
                <servlet-name>presentation</servlet-name>
+               <description>Presentation</description>
                <servlet-class>mir.core.ui.servlet.TemplateServlet</servlet-class>
        </servlet>
-       <servlet-mapping>
-               <servlet-name>presentation</servlet-name>
-               <url-pattern>*.shtml</url-pattern>
-       </servlet-mapping>
-       
+
        <servlet>
                <servlet-name>action</servlet-name>
+               <description>Action</description>
                <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
         <init-param>
-               <param-name>config</param-name>
-               <param-value>/WEB-INF/etc/struts-config.xml</param-value>
+            <param-name>config</param-name>
+            <param-value>/WEB-INF/etc/struts-config.xml</param-value>            
         </init-param>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
-       
-    <servlet>
-        <servlet-name>
-            Mir
-        </servlet-name>
-        <servlet-class>
-            Mir
-        </servlet-class>
-
         <init-param>
-            <param-name>Config</param-name>
-            <param-value>etc/config.properties</param-value>
+            <param-name>config/admin</param-name>
+            <param-value>/WEB-INF/etc/struts-config-admin.xml</param-value>
         </init-param>
-
-    </servlet>
-
-    <servlet>
-        <servlet-name>
-            OpenMir
-        </servlet-name>
-        <servlet-class>
-            OpenMir
-        </servlet-class>
-
         <init-param>
-            <param-name>Config</param-name>
-            <param-value>etc/config.properties</param-value>
+            <param-name>debug</param-name>
+            <param-value>3</param-value>        
         </init-param>
-
-    </servlet>
-    
-    <servlet-mapping>
-        <servlet-name>
-            Mir
-        </servlet-name>
-        <url-pattern>
-            /Mir
-        </url-pattern>
-    </servlet-mapping>
+        <init-param>
+            <param-name>detail</param-name>
+            <param-value>3</param-value>     
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+       </servlet>
+       
+       <servlet-mapping>
+               <servlet-name>presentation</servlet-name>
+               <url-pattern>*.shtml</url-pattern>
+       </servlet-mapping>
+       
+       <servlet-mapping>
+               <servlet-name>action</servlet-name>
+               <url-pattern>*.do</url-pattern>
+       </servlet-mapping> 
 
     <servlet-mapping>
-        <servlet-name>
-            Mir
-        </servlet-name>
-        <url-pattern>
-            /servlet/Mir
-        </url-pattern>
+        <servlet-name>Mir</servlet-name>
+        <url-pattern>/servlet/Mir</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
         <servlet-name>OpenMir</servlet-name>
-        <url-pattern>/OpenMir</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>OpenMir</servlet-name>
         <url-pattern>/servlet/OpenMir</url-pattern>
     </servlet-mapping>
 
@@ -86,11 +77,21 @@
                <filter-name>authentication</filter-name>
                <filter-class>mir.core.ui.filter.AuthenticationFilter</filter-class>    
        </filter>
-       
-       <filter-mapping>
+
+    <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