message-admin complete\rweb.xml parses without errors

diff --git a/etc/struts-config-admin.xml b/etc/struts-config-admin.xml
index 426513e..fe6fa38 100755 (executable)
--- a/etc/struts-config-admin.xml
+++ b/etc/struts-config-admin.xml
@@ -11,6 +11,24 @@
                <form-property name="login" type="java.lang.String"/>
                <form-property name="password" type="java.lang.String"/>
         </form-bean>
+        <form-bean dynamic="true" name="confirmForm" type="org.apache.struts.action.DynaActionForm">
+               <form-property name="id" type="java.lang.String"/>
+               <form-property name="offset" type="java.lang.String"/>
+               <form-property name="order" type="java.lang.String"/>
+               <form-property name="where" type="java.lang.String"/>
+               <form-property name="okurl" type="java.lang.String"/>
+               <form-property name="cancelurl" type="java.lang.String"/>
+               <form-property name="cancel" type="java.lang.String"/>
+               <form-property name="confirm" type="java.lang.String"/>
+        </form-bean>
+        <form-bean dynamic="true" name="messageForm" type="org.apache.struts.action.DynaActionForm">
+               <form-property name="id" type="java.lang.String"/>
+               <form-property name="new" type="java.lang.Boolean"/>
+               <form-property name="offset" type="java.lang.String"/>
+               <form-property name="title" type="java.lang.String"/>
+               <form-property name="creator" type="java.lang.String"/>
+               <form-property name="description" type="java.lang.String"/>
+        </form-bean>
     </form-beans>
     
     <!-- ========== Global Exception Definitions ============================== -->
@@ -23,11 +41,40 @@
             path="index.do"
             redirect="true"
             contextRelative="false" />
+        <forward
+            name="confirm"
+            path="/confirm.shtml"
+            redirect="false"
+            contextRelative="false" />
+        <forward
+            name="logon"
+            path="/logon.do"
+            redirect="true"
+            contextRelative="false" />
     </global-forwards>
     
     <!-- ========== Action Mapping Definitions =============================== -->
     <action-mappings>
         <action
+            attribute="confirmForm"
+            input="/admin/confirm.shtml"
+            name="confirmForm"
+            parameter="confirm"
+            path="/confirm"
+            scope="request"
+            type="mir.core.ui.action.admin.ConfirmAction"
+            unknown="false"
+            validate="true">
+               <forward
+                name="failed"
+                path="/logon.shtml"/>
+            <forward
+                name="success"
+                path="/index.do"/>
+        </action>
+               
+        <!-- Authenticate -->
+        <action
             attribute="logonForm"
             input="/admin/logon.shtml"
             name="logonForm"
@@ -57,16 +104,65 @@
             type="mir.core.ui.action.admin.StartpageAction">
             <forward
                 name="success"
-                path="/admin/index.shtml"/>
+                path="/index.shtml"/>
         </action>
         
+        <!-- Message -->
         <action
             parameter="list"
             path="/messageList"
             type="mir.core.ui.action.admin.MessageAction">
             <forward
                 name="success"
-                path="/admin/messagelist.shtml"/>
+                path="/messagelist.shtml"/>
+        </action>
+        
+        <action
+            parameter="delete"
+            path="/messageDelete"
+            type="mir.core.ui.action.admin.MessageAction">
+            <forward
+                name="success"
+                path="/messageList.do"/>
+            <forward
+                name="failed"
+                path="/messageEdit.do"/>
+        </action>        
+        
+        <action
+            parameter="edit"
+            path="/messageEdit"
+            type="mir.core.ui.action.admin.MessageAction">
+            <forward
+                name="success"
+                path="/message.shtml"/>
+        </action>
+        
+        <action
+            parameter="add"
+            path="/messageAdd"
+            type="mir.core.ui.action.admin.MessageAction">
+            <forward
+                name="success"
+                path="/message.shtml"/>
+        </action>
+        
+        <action
+            attribute="messageForm"
+            input="/admin/message.shtml"
+            name="messageForm"
+            parameter="save"
+            path="/messageSave"
+            scope="request"
+            type="mir.core.ui.action.admin.MessageAction"
+            unknown="false"
+            validate="true">
+            <forward
+                name="failed"
+                path="/messageEdit.do"/>
+            <forward
+                name="success"
+                path="/messageList.do"/>
         </action>
     </action-mappings>
     

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