From 0b5661c572b4496281684195a4c609009e47e108 Mon Sep 17 00:00:00 2001
From: idfx <idfx>
Date: Fri, 5 Sep 2003 20:17:36 +0000
Subject: [PATCH] let us start using struts

---
 etc/struts-config.xml | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++
 etc/web.xml           | 74 +++++++++++++++++----------------------
 2 files changed, 129 insertions(+), 42 deletions(-)
 create mode 100755 etc/struts-config.xml

diff --git a/etc/struts-config.xml b/etc/struts-config.xml
new file mode 100755
index 00000000..4b946194
--- /dev/null
+++ b/etc/struts-config.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!DOCTYPE struts-config PUBLIC
+          "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
+          "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+
+<!--
+     This is the Struts configuration file for the example application,
+     using the proposed new syntax.
+-->
+
+
+<struts-config>
+
+
+  <!-- ========== Data Source Configuration =============================== -->
+<!--
+ <data-sources>
+   <data-source>
+     <set-property property="autoCommit"
+                      value="false"/>
+     <set-property property="description"
+                      value="Example Data Source Configuration"/>
+     <set-property property="driverClass"
+                      value="org.postgresql.Driver"/>
+     <set-property property="maxCount"
+                      value="4"/>
+     <set-property property="minCount"
+                      value="2"/>
+     <set-property property="password"
+                      value="mypassword"/>
+     <set-property property="url"
+                      value="jdbc:postgresql://localhost/mydatabase"/>
+     <set-property property="user"
+                      value="myusername"/>
+   </data-source>
+ </data-sources>
+-->
+  <!-- ========== Form Bean Definitions =================================== -->
+  <form-beans>
+
+    <!-- Logon form bean -->
+    <form-bean       name="logonForm"
+                     type="org.apache.struts.validator.DynaValidatorForm">
+      <form-property name="username" type="java.lang.String"/>
+      <form-property name="password" type="java.lang.String"/>
+    </form-bean>
+
+  <!-- ========== Global Forward Definitions ============================== -->
+  <global-forwards>
+    <forward   name="logoff"               path="/admin/logout.do"/>
+    <forward   name="logon"                path="/admin/login.shtml"/>
+    <forward   name="success"              path="/admin/index.shtml"/>
+  </global-forwards>
+
+
+  <!-- ========== Action Mapping Definitions ============================== -->
+  <action-mappings>
+    <!-- Process a user logoff -->
+    <action    path="/logoff"
+               type="mir.core.ui.action.AuthenticationAction">
+      <forward name="success" path="/index.shtml"/>
+    </action>
+
+    <!-- Process a user logon -->
+    <action    path="/logon"
+               type="mir.core.ui.action.AuthenticationAction"
+               name="logonForm"
+              scope="session"
+              input="logon">
+      <exception
+                key="expired.password"
+               type="org.apache.struts.webapp.example.ExpiredPasswordException"
+               path="/changePassword.jsp"/>
+    </action>
+  </action-mappings>
+
+
+  <!-- ========== Controller Configuration ================================ -->
+
+  <controller>
+    <!-- The "input" parameter on "action" elements is the name of a
+         local or global "forward" rather than a module-relative path -->
+    <set-property property="inputForward" value="true"/>
+  </controller>
+
+
+  <!-- ========== Message Resources Definitions =========================== -->
+
+  <!-- ========== Plug Ins Configuration ================================== -->
+
+  <plug-in className="mir.core.ui.plugin.HibernatePlugin">
+    <!--
+    <set-property property="pathname" value="/WEB-INF/database.xml"/>
+    -->
+  </plug-in>
+</struts-config>
diff --git a/etc/web.xml b/etc/web.xml
index 42b57983..db47a25b 100755
--- a/etc/web.xml
+++ b/etc/web.xml
@@ -1,10 +1,30 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-    "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3 //EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app>
+
+	<servlet>
+		<servlet-name>presentation</servlet-name>
+		<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>
+	  	<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>
+        </init-param>
+  		<load-on-startup>1</load-on-startup>
+	</servlet>
+	
     <servlet>
         <servlet-name>
             Mir
@@ -62,6 +82,15 @@
         <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>
     <mime-mapping>
       <extension>
         mp3 
@@ -126,43 +155,4 @@
         application/pdf
       </mime-type>
     </mime-mapping>
-
-    <security-constraint>
-      <web-resource-collection>
-         <web-resource-name>Protected Area</web-resource-name>
-	 <!-- Define the context-relative URL(s) to be protected -->
-         <url-pattern>/jsp/security/protected/*</url-pattern>
-	 <!-- If you list http methods, only those methods are protected -->
-	 <http-method>DELETE</http-method>
-         <http-method>GET</http-method>
-         <http-method>POST</http-method>
-	 <http-method>PUT</http-method>
-      </web-resource-collection>
-      <auth-constraint>
-         <!-- Anyone with one of the listed roles may access this area -->
-         <role-name>tomcat</role-name>
-	 <role-name>role1</role-name>
-      </auth-constraint>
-    </security-constraint>
-
-    <!-- Default login configuration uses BASIC authentication -->
-    <!--
-    <login-config>
-      <auth-method>BASIC</auth-method>
-      <realm-name>Example Basic Authentication Area</realm-name>
-    </login-config>
-    -->
-
-    <!-- Form-based login is enabled by default.  If you wish to
-         try Basic authentication, comment out the <login-config>
-         section below and uncomment the one above. -->
-    <login-config>
-      <auth-method>FORM</auth-method>
-      <realm-name>Example Form-Based Authentication Area</realm-name>
-      <form-login-config>
-        <form-login-page>/jsp/security/login/login.jsp</form-login-page>
-        <form-error-page>/jsp/security/login/error.jsp</form-error-page>
-      </form-login-config>
-    </login-config>
-
-</web-app>
+</web-app>
\ No newline at end of file
-- 
2.11.0