Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.10 -r1.11
--- lams_admin/web/WEB-INF/struts/struts-config.xml	9 Jun 2006 02:43:27 -0000	1.10
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	16 Jun 2006 06:57:54 -0000	1.11
@@ -30,17 +30,48 @@
 	<form-property name="typeId" type="java.lang.Integer" />
 	<form-property name="stateId" type="java.lang.Integer" />
 </form-bean>
+
+<form-bean name="UserForm" type="org.apache.struts.action.DynaActionForm">
+    <form-property name="orgId" type="java.lang.Integer" />
+	<form-property name="userId" type="java.lang.Integer" />
+	<form-property name="login" type="java.lang.String" />
+	<form-property name="password" type="java.lang.String" />
+	<form-property name="title" type="java.lang.String" />
+	<form-property name="firstName" type="java.lang.String" />
+	<form-property name="lastName" type="java.lang.String" />
+	<form-property name="addressLine1" type="java.lang.String" />
+	<form-property name="addressLine2" type="java.lang.String" />
+	<form-property name="addressLine3" type="java.lang.String" />
+	<form-property name="city" type="java.lang.String" />
+	<form-property name="state" type="java.lang.String" />
+	<form-property name="country" type="java.lang.String" />
+	<form-property name="dayPhone" type="java.lang.String" />
+	<form-property name="eveningPhone" type="java.lang.String" />
+	<form-property name="mobilePhone" type="java.lang.String" />
+	<form-property name="fax" type="java.lang.String" />
+	<form-property name="email" type="java.lang.String" />
+	<form-property name="localeLanguage" type="java.lang.String" />
+	<form-property name="localeCountry" type="java.lang.String" />
+	<form-property name="learner" type="java.lang.String" />
+	<form-property name="author" type="java.lang.String" />
+	<form-property name="staff" type="java.lang.String" />
+	<form-property name="admin" type="java.lang.String" />
+	<form-property name="manager" type="java.lang.String" />
+</form-bean>
+
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
-  <global-exceptions>
+  <!-- 
+<global-exceptions>
   <exception
     handler="org.apache.struts.action.ExceptionHandler"
     key="error.system"
     path=".error"
     scope="request"
     type="java.lang.Exception"/>
 </global-exceptions>
+-->
 
   <!-- ========== Global Forward Definitions =================================== -->
   <global-forwards>
@@ -94,6 +125,18 @@
       />
     </action>
     <action
+      path="/usermanage"
+      type="org.lamsfoundation.lams.admin.web.UserManageAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="userlist"
+        path=".userlist"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/organisation"
       type="org.lamsfoundation.lams.admin.web.OrganisationAction"
       name="OrganisationForm"
@@ -114,6 +157,46 @@
       />
     </action>
     <action
+      path="/usersave"
+      type="org.lamsfoundation.lams.admin.web.UserSaveAction"
+      name="UserForm"
+      scope="request"
+      input=".user"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="user"
+        path=".user"
+        redirect="false"
+      />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/user"
+      type="org.lamsfoundation.lams.admin.web.UserAction"
+      name="UserForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="user"
+        path=".user"
+        redirect="false"
+      />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/cache"
       type="org.lamsfoundation.lams.admin.web.CacheAction"
       name="CacheActionForm"