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.14 -r1.15
--- lams_admin/web/WEB-INF/struts/struts-config.xml	18 Oct 2006 05:31:37 -0000	1.14
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	20 Oct 2006 07:04:30 -0000	1.15
@@ -106,6 +106,28 @@
 	<form-property name="cValue" type="java.lang.String[]" />
 	<form-property name="method" type="java.lang.String" />
 </form-bean>
+
+<form-bean name="RegisterForm" type="org.apache.struts.action.DynaActionForm">
+	<form-property name="sitename" type="java.lang.String" />
+	<form-property name="serverurl" type="java.lang.String" />
+	<form-property name="serverversion" type="java.lang.String" />
+	<form-property name="serverbuild" type="java.lang.String" />
+	<form-property name="serverlocale" type="java.lang.String" />
+	<form-property name="servercountry" type="java.lang.String" />
+ 	<form-property name="countries" type="java.lang.String[]" />
+	<form-property name="langdate" type="java.lang.String" />
+	<form-property name="groupno" type="java.lang.Integer" />
+	<form-property name="subgroupno" type="java.lang.Integer" />
+	<form-property name="sysadminno" type="java.lang.Integer" />
+	<form-property name="adminno" type="java.lang.Integer" />
+	<form-property name="authorno" type="java.lang.Integer" />
+	<form-property name="monitorno" type="java.lang.Integer" />
+	<form-property name="managerno" type="java.lang.Integer" />
+	<form-property name="learnerno" type="java.lang.Integer" />
+	<form-property name="public" type="java.lang.Boolean" initial="true" />
+	<form-property name="rname" type="java.lang.String" />
+	<form-property name="remail" type="java.lang.String" />
+</form-bean>
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
@@ -146,21 +168,6 @@
       />
     </action>
     <action
-      path="/usersearch"
-      type="org.lamsfoundation.lams.admin.web.UserSearchAction"
-      name="UserSearchForm"
-      scope="request"
-      input=".usersearchlist"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="usersearchlist"
-        path=".usersearchlist"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/orgmanage"
       type="org.lamsfoundation.lams.admin.web.OrgManageAction"
       unknown="false"
@@ -173,30 +180,21 @@
       />
     </action>
     <action
-      path="/joblist"
-      type="org.lamsfoundation.lams.admin.web.ScheduledJobListAction"
+      path="/usersearch"
+      type="org.lamsfoundation.lams.admin.web.UserSearchAction"
+      name="UserSearchForm"
+      scope="request"
+      input=".usersearchlist"
       unknown="false"
       validate="false"
     >
       <forward
-        name="list"
-        path=".joblist"
+        name="usersearchlist"
+        path=".usersearchlist"
         redirect="false"
       />
     </action>
     <action
-      path="/disabledmanage"
-      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="disabledlist"
-        path=".disabledlist"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/serverlist"
       type="org.lamsfoundation.lams.admin.web.ServerListAction"
       unknown="false"
@@ -239,82 +237,108 @@
       />
     </action>
     <action
-      path="/userorgrolesave"
-      type="org.lamsfoundation.lams.admin.web.UserOrgRoleSaveAction"
-      name="UserOrgRoleForm"
-      scope="session"
-      input=".userorgrole"
+      path="/serversave"
+      type="org.lamsfoundation.lams.admin.web.ServerSaveAction"
+      name="ServerOrgMapForm"
+      scope="request"
+      input=".servermaintain"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="success"
+        path="/serverlist.do"
         redirect="false"
       />
     </action>
     <action
-      path="/cache"
-      type="org.lamsfoundation.lams.admin.web.CacheAction"
-      name="CacheActionForm"
+      path="/organisation"
+      type="org.lamsfoundation.lams.admin.web.OrganisationAction"
+      name="OrganisationForm"
       scope="request"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="cache"
-        path=".cache"
+        name="organisation"
+        path=".organisation"
         redirect="false"
       />
+      <forward
+        name="orglist"
+        path="/orgmanage.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/serversave"
-      type="org.lamsfoundation.lams.admin.web.ServerSaveAction"
-      name="ServerOrgMapForm"
+      path="/userroles"
+      type="org.lamsfoundation.lams.admin.web.UserRolesAction"
+      name="UserRolesForm"
       scope="request"
-      input=".servermaintain"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path="/serverlist.do"
+        name="userrole"
+        path=".userrole"
         redirect="false"
       />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/servermaintain"
-      type="org.lamsfoundation.lams.admin.web.ServerMaintainAction"
-      name="ServerOrgMapForm"
+      path="/config"
+      type="org.lamsfoundation.lams.admin.web.ConfigAction"
+      name="ConfigForm"
       scope="request"
+      input=".config"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="servermaintain"
-        path=".servermaintain"
+        name="config"
+        path=".config"
         redirect="false"
       />
       <forward
-        name="serverlist"
-        path="/serverlist.do"
+        name="sysadmin"
+        path=".sysadmin"
         redirect="false"
       />
     </action>
     <action
-      path="/userroles"
-      type="org.lamsfoundation.lams.admin.web.UserRolesAction"
+      path="/loginmaintain"
+      type="org.lamsfoundation.lams.admin.web.LoginMaintainAction"
+      name="LoginMaintainForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="loginmaintain"
+        path=".loginmaintain"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/userrolessave"
+      type="org.lamsfoundation.lams.admin.web.UserRolesSaveAction"
       name="UserRolesForm"
       scope="request"
+      input=".userroles"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userrole"
-        path=".userrole"
+        name="userroles"
+        path="/userroles.do"
         redirect="false"
       />
       <forward
@@ -324,90 +348,135 @@
       />
     </action>
     <action
-      path="/usermanage"
-      type="org.lamsfoundation.lams.admin.web.UserManageAction"
+      path="/loginsave"
+      type="org.lamsfoundation.lams.admin.web.LoginSaveAction"
+      name="LoginMaintainForm"
+      scope="request"
+      input=".loginmaintian"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path=".userlist"
+        name="sysadmin"
+        path=".sysadmin"
         redirect="false"
       />
+      <forward
+        name="loginmaintain"
+        path=".loginmaintain"
+        redirect="false"
+      />
     </action>
     <action
-      path="/organisation"
-      type="org.lamsfoundation.lams.admin.web.OrganisationAction"
-      name="OrganisationForm"
-      scope="request"
-      parameter="method"
+      path="/joblist"
+      type="org.lamsfoundation.lams.admin.web.ScheduledJobListAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="organisation"
-        path=".organisation"
+        name="list"
+        path=".joblist"
         redirect="false"
       />
+    </action>
+    <action
+      path="/disabledmanage"
+      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="orglist"
-        path="/orgmanage.do"
+        name="disabledlist"
+        path=".disabledlist"
         redirect="false"
       />
     </action>
     <action
-      path="/config"
-      type="org.lamsfoundation.lams.admin.web.ConfigAction"
-      name="ConfigForm"
+      path="/cache"
+      type="org.lamsfoundation.lams.admin.web.CacheAction"
+      name="CacheActionForm"
       scope="request"
-      input=".config"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="config"
-        path=".config"
+        name="cache"
+        path=".cache"
         redirect="false"
       />
+    </action>
+    <action
+      path="/userorgrolesave"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleSaveAction"
+      name="UserOrgRoleForm"
+      scope="session"
+      input=".userorgrole"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="sysadmin"
-        path=".sysadmin"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
     </action>
     <action
-      path="/loginmaintain"
-      type="org.lamsfoundation.lams.admin.web.LoginMaintainAction"
-      name="LoginMaintainForm"
+      path="/servermaintain"
+      type="org.lamsfoundation.lams.admin.web.ServerMaintainAction"
+      name="ServerOrgMapForm"
       scope="request"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="loginmaintain"
-        path=".loginmaintain"
+        name="servermaintain"
+        path=".servermaintain"
         redirect="false"
       />
+      <forward
+        name="serverlist"
+        path="/serverlist.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/userrolessave"
-      type="org.lamsfoundation.lams.admin.web.UserRolesSaveAction"
-      name="UserRolesForm"
+      path="/register"
+      type="org.lamsfoundation.lams.admin.web.RegisterAction"
+      name="RegisterForm"
       scope="request"
-      input=".userroles"
+      input=".register"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userroles"
-        path="/userroles.do"
+        name="register"
+        path=".register"
         redirect="false"
       />
       <forward
+        name="sysadmin"
+        path=".sysadmin"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/usermanage"
+      type="org.lamsfoundation.lams.admin.web.UserManageAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
         name="userlist"
-        path="/usermanage.do"
+        path=".userlist"
         redirect="false"
       />
     </action>
@@ -494,27 +563,6 @@
         redirect="false"
       />
     </action>
-    <action
-      path="/loginsave"
-      type="org.lamsfoundation.lams.admin.web.LoginSaveAction"
-      name="LoginMaintainForm"
-      scope="request"
-      input=".loginmaintian"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="sysadmin"
-        path=".sysadmin"
-        redirect="false"
-      />
-      <forward
-        name="loginmaintain"
-        path=".loginmaintain"
-        redirect="false"
-      />
-    </action>
 
        <action
       path="/sysadminstart"