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.24.2.1 -r1.24.2.1.2.1
--- lams_admin/web/WEB-INF/struts/struts-config.xml	3 Jun 2009 06:36:50 -0000	1.24.2.1
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	30 Mar 2010 23:50:03 -0000	1.24.2.1.2.1
@@ -14,33 +14,37 @@
   <form-beans>
 
     <form-bean
-      name="UserOrgRoleForm"
-      type="org.lamsfoundation.lams.admin.web.UserOrgRoleForm"
+      name="OrgManageForm"
+      type="org.lamsfoundation.lams.admin.web.form.OrgManageForm"
     />
     <form-bean
+      name="ImportV1Form"
+      type="org.lamsfoundation.lams.admin.web.form.ImportV1Form"
+    />
+    <form-bean
+      name="ImportExcelForm"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelForm"
+    />
+    <form-bean
       name="RegisterForm"
       type="org.lamsfoundation.lams.admin.web.RegisterForm"
     />
     <form-bean
-      name="CacheActionForm"
-      type="org.lamsfoundation.lams.admin.web.CacheActionForm"
+      name="themeForm"
+      type="org.lamsfoundation.lams.admin.web.form.ThemeForm"
     />
     <form-bean
-      name="OrgManageForm"
-      type="org.lamsfoundation.lams.admin.web.form.OrgManageForm"
+      name="UserOrgRoleForm"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleForm"
     />
     <form-bean
       name="ImportV1ContentsForm"
       type="org.lamsfoundation.lams.admin.web.form.ImportV1ContentsForm"
     />
     <form-bean
-      name="ImportV1Form"
-      type="org.lamsfoundation.lams.admin.web.form.ImportV1Form"
+      name="CacheActionForm"
+      type="org.lamsfoundation.lams.admin.web.CacheActionForm"
     />
-    <form-bean
-      name="ImportExcelForm"
-      type="org.lamsfoundation.lams.admin.web.ImportExcelForm"
-    />
 
    <form-bean name="OrganisationForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="orgId" type="java.lang.Integer" />
@@ -88,6 +92,8 @@
 	<form-property name="fax" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
 	<form-property name="localeId" type="java.lang.Integer" />
+	<form-property name="userCSSTheme" type="java.lang.Long" />
+	<form-property name="userFlashTheme" type="java.lang.Long" />
 </form-bean>
 
 <form-bean name="UserOrgForm" type="org.apache.struts.action.DynaActionForm">
@@ -157,59 +163,66 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/orgsave"
-      type="org.lamsfoundation.lams.admin.web.OrgSaveAction"
-      name="OrganisationForm"
-      scope="request"
-      input=".organisation"
+      path="/libraryManage"
+      type="org.lamsfoundation.lams.admin.web.LibraryManageAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="organisation"
-        path="/organisation.do?method=edit"
+        name="success"
+        path=".librarylist"
         redirect="false"
       />
+    </action>
+    <action
+      path="/sysadminstart"
+      type="org.lamsfoundation.lams.admin.web.action.SysAdminStartAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="orglist"
-        path="/orgmanage.do"
+        name="sysadmin"
+        path=".sysadmin"
         redirect="false"
       />
-      <forward
-        name="userlist"
-        path="/usermanage.do"
-        redirect="false"
-      />
     </action>
     <action
-      path="/usersearch"
-      type="org.lamsfoundation.lams.admin.web.UserSearchAction"
-      name="UserSearchForm"
-      scope="request"
-      input=".usersearchlist"
+      path="/ldap"
+      type="org.lamsfoundation.lams.admin.web.action.LdapConfigAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="usersearchlist"
-        path=".usersearchlist"
+        name="ldap"
+        path=".ldap"
         redirect="false"
       />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/orgmanage"
-      type="org.lamsfoundation.lams.admin.web.OrgManageAction"
-      name="OrgManageForm"
+      path="/userrolessave"
+      type="org.lamsfoundation.lams.admin.web.UserRolesSaveAction"
+      name="UserRolesForm"
       scope="request"
-      input=".orglist"
+      input=".userroles"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="orglist"
-        path=".orglist"
+        name="userroles"
+        path="/userroles.do"
         redirect="false"
       />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
     </action>
     <action
       path="/importv1contentssave"
@@ -232,92 +245,139 @@
       />
     </action>
     <action
-      path="/libraryManage"
-      type="org.lamsfoundation.lams.admin.web.LibraryManageAction"
+      path="/cleanup"
+      type="org.lamsfoundation.lams.admin.web.action.CleanupTempFilesAction"
+      name="CleanupForm"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path=".librarylist"
+        name="cleanup"
+        path=".cleanup"
         redirect="false"
       />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/serverlist"
-      type="org.lamsfoundation.lams.admin.web.ServerListAction"
+      path="/usersearch"
+      type="org.lamsfoundation.lams.admin.web.UserSearchAction"
+      name="UserSearchForm"
+      scope="request"
+      input=".usersearchlist"
       unknown="false"
       validate="false"
     >
       <forward
-        name="serverlist"
-        path=".serverlist"
+        name="usersearchlist"
+        path=".usersearchlist"
         redirect="false"
       />
     </action>
     <action
-      path="/user/searchsingle"
-      type="org.lamsfoundation.lams.admin.web.action.UserSearchSingleTermAction"
+      path="/organisation"
+      type="org.lamsfoundation.lams.admin.web.OrganisationAction"
+      name="OrganisationForm"
+      scope="request"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="basiclist"
-        path="/user/basiclist.jsp"
+        name="organisation"
+        path=".organisation"
         redirect="false"
       />
+      <forward
+        name="organisationCourseAdmin"
+        path=".organisationCourseAdmin"
+        redirect="false"
+      />
+      <forward
+        name="orglist"
+        path="/orgmanage.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/importexcelsave"
-      type="org.lamsfoundation.lams.admin.web.ImportExcelSaveAction"
-      name="ImportExcelForm"
+      path="/userorg"
+      type="org.lamsfoundation.lams.admin.web.UserOrgAction"
+      name="UserOrgForm"
       scope="request"
-      input=".importexcel"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importresult"
-        path=".importresult"
+        name="userorg"
+        path=".userorg"
         redirect="false"
       />
+    </action>
+    <action
+      path="/serversave"
+      type="org.lamsfoundation.lams.admin.web.ServerSaveAction"
+      name="ServerOrgMapForm"
+      scope="request"
+      input=".servermaintain"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
+        name="success"
+        path="/serverlist.do"
         redirect="false"
       />
+    </action>
+    <action
+      path="/usermanage"
+      type="org.lamsfoundation.lams.admin.web.UserManageAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="import"
-        path="/importexcel.do"
+        name="userlist"
+        path=".userlist"
         redirect="false"
       />
+    </action>
+    <action
+      path="/userorgsave"
+      type="org.lamsfoundation.lams.admin.web.UserOrgSaveAction"
+      name="UserOrgForm"
+      scope="request"
+      input=".userorg"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="status"
-        path="/import/status.jsp"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
       <forward
-        name="results"
-        path="/importuserresult.do"
+        name="userorgrole"
+        path="/userorgrole.do"
         redirect="false"
       />
     </action>
     <action
-      path="/cleanup"
-      type="org.lamsfoundation.lams.admin.web.action.CleanupTempFilesAction"
-      name="CleanupForm"
-      scope="request"
+      path="/toolcontentlist"
+      type="org.lamsfoundation.lams.admin.web.ToolContentListAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="cleanup"
-        path=".cleanup"
+        name="toolcontentlist"
+        path=".toolcontentlist"
         redirect="false"
       />
       <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
+        name="error"
+        path=".error"
         redirect="false"
       />
     </action>
@@ -352,56 +412,40 @@
       />
     </action>
     <action
-      path="/serversave"
-      type="org.lamsfoundation.lams.admin.web.ServerSaveAction"
-      name="ServerOrgMapForm"
+      path="/config"
+      type="org.lamsfoundation.lams.admin.web.ConfigAction"
+      name="ConfigForm"
       scope="request"
-      input=".servermaintain"
+      input=".config"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path="/serverlist.do"
+        name="config"
+        path=".config"
         redirect="false"
       />
-    </action>
-    <action
-      path="/sysadminstart"
-      type="org.lamsfoundation.lams.admin.web.action.SysAdminStartAction"
-      unknown="false"
-      validate="false"
-    >
       <forward
         name="sysadmin"
-        path=".sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
     <action
-      path="/importv1save"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1SaveAction"
-      name="ImportV1Form"
+      path="/cache"
+      type="org.lamsfoundation.lams.admin.web.CacheAction"
+      name="CacheActionForm"
       scope="request"
-      input=".importv1"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1contents"
-        path="/importv1contents.do"
+        name="cache"
+        path=".cache"
         redirect="false"
       />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
-      <forward
-        name="importv1"
-        path="/importv1.do"
-        redirect="false"
-      />
     </action>
     <action
       path="/userroles"
@@ -424,151 +468,160 @@
       />
     </action>
     <action
-      path="/organisation"
-      type="org.lamsfoundation.lams.admin.web.OrganisationAction"
-      name="OrganisationForm"
+      path="/loginsave"
+      type="org.lamsfoundation.lams.admin.web.LoginSaveAction"
+      name="LoginMaintainForm"
       scope="request"
+      input=".loginmaintian"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="organisation"
-        path=".organisation"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
       <forward
-        name="organisationCourseAdmin"
-        path=".organisationCourseAdmin"
+        name="loginmaintain"
+        path=".loginmaintain"
         redirect="false"
       />
-      <forward
-        name="orglist"
-        path="/orgmanage.do"
-        redirect="false"
-      />
     </action>
     <action
-      path="/config"
-      type="org.lamsfoundation.lams.admin.web.ConfigAction"
-      name="ConfigForm"
+      path="/themeManagement"
+      type="org.lamsfoundation.lams.admin.web.action.ThemeManagementAction"
+      name="themeForm"
       scope="request"
-      input=".config"
+      input=".themeManagement"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="config"
-        path=".config"
+        name="success"
+        path=".themeManagement"
         redirect="false"
       />
       <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
+        name="error"
+        path=".error"
         redirect="false"
       />
     </action>
     <action
-      path="/loginmaintain"
-      type="org.lamsfoundation.lams.admin.web.LoginMaintainAction"
-      name="LoginMaintainForm"
-      scope="request"
+      path="/userorgrolesave"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleSaveAction"
+      name="UserOrgRoleForm"
+      scope="session"
+      input=".userorgrole"
       unknown="false"
       validate="false"
     >
       <forward
-        name="loginmaintain"
-        path=".loginmaintain"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
+      <forward
+        name="userorg"
+        path="/userorg.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/userrolessave"
-      type="org.lamsfoundation.lams.admin.web.UserRolesSaveAction"
-      name="UserRolesForm"
+      path="/user"
+      type="org.lamsfoundation.lams.admin.web.UserAction"
+      name="UserForm"
       scope="request"
-      input=".userroles"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userroles"
-        path="/userroles.do"
+        name="user"
+        path=".user"
         redirect="false"
       />
       <forward
         name="userlist"
         path="/usermanage.do"
         redirect="false"
       />
+      <forward
+        name="remove"
+        path=".remove"
+        redirect="false"
+      />
+      <forward
+        name="disabledlist"
+        path="/disabledmanage.do"
+        redirect="false"
+      />
+      <forward
+        name="usersearch"
+        path="/usersearch.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/importv1contents"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsAction"
-      name="ImportV1ContentsForm"
-      scope="session"
+      path="/user/basiclist"
+      type="org.lamsfoundation.lams.admin.web.action.UserBasicListAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1contents"
-        path=".importv1contents"
+        name="basiclist"
+        path="/user/basiclist.jsp"
         redirect="false"
       />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
     </action>
     <action
-      path="/loginsave"
-      type="org.lamsfoundation.lams.admin.web.LoginSaveAction"
+      path="/loginmaintain"
+      type="org.lamsfoundation.lams.admin.web.LoginMaintainAction"
       name="LoginMaintainForm"
       scope="request"
-      input=".loginmaintian"
-      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
-      <forward
         name="loginmaintain"
         path=".loginmaintain"
         redirect="false"
       />
     </action>
     <action
-      path="/importv1"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1Action"
-      name="ImportV1Form"
+      path="/timezonemanagement"
+      type="org.lamsfoundation.lams.admin.web.action.TimezoneManagementAction"
+      name="ConfigForm"
       scope="request"
+      input=".config"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1"
-        path=".importv1"
+        name="timezonemanagement"
+        path=".timezonemanagement"
         redirect="false"
       />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/importgroups"
-      type="org.lamsfoundation.lams.admin.web.action.ImportGroupsAction"
-      name="ImportGroupsForm"
-      scope="request"
+      path="/importv1contents"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsAction"
+      name="ImportV1ContentsForm"
+      scope="session"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importGroups"
-        path=".importGroups"
+        name="importv1contents"
+        path=".importv1contents"
         redirect="false"
       />
       <forward
@@ -590,157 +643,159 @@
       />
     </action>
     <action
-      path="/importuserresult"
-      type="org.lamsfoundation.lams.admin.web.action.ImportUserResultAction"
+      path="/importgroups"
+      type="org.lamsfoundation.lams.admin.web.action.ImportGroupsAction"
+      name="ImportGroupsForm"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importresult"
-        path=".importresult"
+        name="importGroups"
+        path=".importGroups"
         redirect="false"
       />
-    </action>
-    <action
-      path="/user/basiclist"
-      type="org.lamsfoundation.lams.admin.web.action.UserBasicListAction"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="basiclist"
-        path="/user/basiclist.jsp"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
     <action
-      path="/disabledmanage"
-      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
+      path="/importexcel"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelAction"
+      name="ImportExcelForm"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="disabledlist"
-        path=".disabledlist"
+        name="importexcel"
+        path=".importexcel"
         redirect="false"
       />
     </action>
     <action
-      path="/userorgrolesave"
-      type="org.lamsfoundation.lams.admin.web.UserOrgRoleSaveAction"
-      name="UserOrgRoleForm"
-      scope="session"
-      input=".userorgrole"
+      path="/register"
+      type="org.lamsfoundation.lams.admin.web.RegisterAction"
+      name="RegisterForm"
+      scope="request"
+      input=".register"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="register"
+        path=".register"
         redirect="false"
       />
       <forward
-        name="userorg"
-        path="/userorg.do"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
+      <forward
+        name="success"
+        path="http://lamscommunity.org/registration"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".error"
+        redirect="false"
+      />
     </action>
     <action
-      path="/cache"
-      type="org.lamsfoundation.lams.admin.web.CacheAction"
-      name="CacheActionForm"
-      scope="request"
-      parameter="method"
+      path="/serverlist"
+      type="org.lamsfoundation.lams.admin.web.ServerListAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="cache"
-        path=".cache"
+        name="serverlist"
+        path=".serverlist"
         redirect="false"
       />
     </action>
     <action
-      path="/ldap"
-      type="org.lamsfoundation.lams.admin.web.action.LdapConfigAction"
+      path="/importv1"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1Action"
+      name="ImportV1Form"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="ldap"
-        path=".ldap"
+        name="importv1"
+        path=".importv1"
         redirect="false"
       />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
     </action>
     <action
-      path="/toolcontentlist"
-      type="org.lamsfoundation.lams.admin.web.ToolContentListAction"
+      path="/importuserresult"
+      type="org.lamsfoundation.lams.admin.web.action.ImportUserResultAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="toolcontentlist"
-        path=".toolcontentlist"
+        name="importresult"
+        path=".importresult"
         redirect="false"
       />
-      <forward
-        name="error"
-        path=".error"
-        redirect="false"
-      />
     </action>
     <action
-      path="/servermaintain"
-      type="org.lamsfoundation.lams.admin.web.ServerMaintainAction"
-      name="ServerOrgMapForm"
+      path="/orgsave"
+      type="org.lamsfoundation.lams.admin.web.OrgSaveAction"
+      name="OrganisationForm"
       scope="request"
-      parameter="method"
+      input=".organisation"
       unknown="false"
       validate="false"
     >
       <forward
-        name="servermaintain"
-        path=".servermaintain"
+        name="organisation"
+        path="/organisation.do?method=edit"
         redirect="false"
       />
       <forward
-        name="serverlist"
-        path="/serverlist.do"
+        name="orglist"
+        path="/orgmanage.do"
         redirect="false"
       />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/importexcel"
-      type="org.lamsfoundation.lams.admin.web.ImportExcelAction"
-      name="ImportExcelForm"
+      path="/orgmanage"
+      type="org.lamsfoundation.lams.admin.web.OrgManageAction"
+      name="OrgManageForm"
       scope="request"
+      input=".orglist"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importexcel"
-        path=".importexcel"
+        name="orglist"
+        path=".orglist"
         redirect="false"
       />
     </action>
     <action
-      path="/register"
-      type="org.lamsfoundation.lams.admin.web.RegisterAction"
-      name="RegisterForm"
+      path="/importexcelsave"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelSaveAction"
+      name="ImportExcelForm"
       scope="request"
-      input=".register"
-      parameter="method"
+      input=".importexcel"
       unknown="false"
       validate="false"
     >
       <forward
-        name="register"
-        path=".register"
+        name="importresult"
+        path=".importresult"
         redirect="false"
       />
       <forward
@@ -749,45 +804,38 @@
         redirect="false"
       />
       <forward
-        name="success"
-        path="http://lamscommunity.org/registration"
+        name="import"
+        path="/importexcel.do"
         redirect="false"
       />
       <forward
-        name="error"
-        path=".error"
+        name="status"
+        path="/import/status.jsp"
         redirect="false"
       />
-    </action>
-    <action
-      path="/usermanage"
-      type="org.lamsfoundation.lams.admin.web.UserManageAction"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="userlist"
-        path=".userlist"
+        name="results"
+        path="/importuserresult.do"
         redirect="false"
       />
     </action>
     <action
-      path="/userorgsave"
-      type="org.lamsfoundation.lams.admin.web.UserOrgSaveAction"
-      name="UserOrgForm"
+      path="/servermaintain"
+      type="org.lamsfoundation.lams.admin.web.ServerMaintainAction"
+      name="ServerOrgMapForm"
       scope="request"
-      input=".userorg"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="servermaintain"
+        path=".servermaintain"
         redirect="false"
       />
       <forward
-        name="userorgrole"
-        path="/userorgrole.do"
+        name="serverlist"
+        path="/serverlist.do"
         redirect="false"
       />
     </action>
@@ -806,51 +854,51 @@
       />
     </action>
     <action
-      path="/user"
-      type="org.lamsfoundation.lams.admin.web.UserAction"
-      name="UserForm"
+      path="/importv1save"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1SaveAction"
+      name="ImportV1Form"
       scope="request"
-      parameter="method"
+      input=".importv1"
       unknown="false"
       validate="false"
     >
       <forward
-        name="user"
-        path=".user"
+        name="importv1contents"
+        path="/importv1contents.do"
         redirect="false"
       />
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
       <forward
-        name="remove"
-        path=".remove"
+        name="importv1"
+        path="/importv1.do"
         redirect="false"
       />
+    </action>
+    <action
+      path="/disabledmanage"
+      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
         name="disabledlist"
-        path="/disabledmanage.do"
+        path=".disabledlist"
         redirect="false"
       />
-      <forward
-        name="usersearch"
-        path="/usersearch.do"
-        redirect="false"
-      />
     </action>
     <action
-      path="/userorg"
-      type="org.lamsfoundation.lams.admin.web.UserOrgAction"
-      name="UserOrgForm"
-      scope="request"
+      path="/user/searchsingle"
+      type="org.lamsfoundation.lams.admin.web.action.UserSearchSingleTermAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userorg"
-        path=".userorg"
+        name="basiclist"
+        path="/user/basiclist.jsp"
         redirect="false"
       />
     </action>