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.2.3 -r1.24.2.1.2.4
--- lams_admin/web/WEB-INF/struts/struts-config.xml	6 Apr 2010 20:31:38 -0000	1.24.2.1.2.3
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	1 Oct 2010 16:54:03 -0000	1.24.2.1.2.4
@@ -14,6 +14,10 @@
   <form-beans>
 
     <form-bean
+      name="ImportExcelForm"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelForm"
+    />
+    <form-bean
       name="OrgManageForm"
       type="org.lamsfoundation.lams.admin.web.form.OrgManageForm"
     />
@@ -22,10 +26,6 @@
       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"
     />
@@ -182,35 +182,6 @@
       />
     </action>
     <action
-      path="/sysadminstart"
-      type="org.lamsfoundation.lams.admin.web.action.SysAdminStartAction"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="sysadmin"
-        path=".sysadmin"
-        redirect="false"
-      />
-    </action>
-    <action
-      path="/ldap"
-      type="org.lamsfoundation.lams.admin.web.action.LdapConfigAction"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="ldap"
-        path=".ldap"
-        redirect="false"
-      />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/userrolessave"
       type="org.lamsfoundation.lams.admin.web.UserRolesSaveAction"
       name="UserRolesForm"
@@ -232,36 +203,29 @@
       />
     </action>
     <action
-      path="/importv1contentssave"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsSaveAction"
-      name="ImportV1ContentsForm"
-      scope="session"
-      input=".importv1contents"
+      path="/sysadminstart"
+      type="org.lamsfoundation.lams.admin.web.action.SysAdminStartAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1result"
-        path=".importv1result"
-        redirect="false"
-      />
-      <forward
         name="sysadmin"
-        path="/sysadminstart.do"
+        path=".sysadmin"
         redirect="false"
       />
     </action>
     <action
-      path="/cleanup"
-      type="org.lamsfoundation.lams.admin.web.action.CleanupTempFilesAction"
-      name="CleanupForm"
-      scope="request"
+      path="/importv1contentssave"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsSaveAction"
+      name="ImportV1ContentsForm"
+      scope="session"
+      input=".importv1contents"
       unknown="false"
       validate="false"
     >
       <forward
-        name="cleanup"
-        path=".cleanup"
+        name="importv1result"
+        path=".importv1result"
         redirect="false"
       />
       <forward
@@ -311,16 +275,14 @@
       />
     </action>
     <action
-      path="/userorg"
-      type="org.lamsfoundation.lams.admin.web.UserOrgAction"
-      name="UserOrgForm"
-      scope="request"
+      path="/usermanage"
+      type="org.lamsfoundation.lams.admin.web.UserManageAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userorg"
-        path=".userorg"
+        name="userlist"
+        path=".userlist"
         redirect="false"
       />
     </action>
@@ -340,66 +302,70 @@
       />
     </action>
     <action
-      path="/usermanage"
-      type="org.lamsfoundation.lams.admin.web.UserManageAction"
+      path="/toolcontentlist"
+      type="org.lamsfoundation.lams.admin.web.ToolContentListAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path=".userlist"
+        name="toolcontentlist"
+        path=".toolcontentlist"
         redirect="false"
       />
+      <forward
+        name="error"
+        path=".error"
+        redirect="false"
+      />
     </action>
     <action
-      path="/userorgsave"
-      type="org.lamsfoundation.lams.admin.web.UserOrgSaveAction"
-      name="UserOrgForm"
+      path="/cache"
+      type="org.lamsfoundation.lams.admin.web.CacheAction"
+      name="CacheActionForm"
       scope="request"
-      input=".userorg"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="cache"
+        path=".cache"
         redirect="false"
       />
-      <forward
-        name="userorgrole"
-        path="/userorgrole.do"
-        redirect="false"
-      />
     </action>
     <action
-      path="/toolcontentlist"
-      type="org.lamsfoundation.lams.admin.web.ToolContentListAction"
+      path="/config"
+      type="org.lamsfoundation.lams.admin.web.ConfigAction"
+      name="ConfigForm"
+      scope="request"
+      input=".config"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="toolcontentlist"
-        path=".toolcontentlist"
+        name="config"
+        path=".config"
         redirect="false"
       />
       <forward
-        name="error"
-        path=".error"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
     <action
-      path="/usersave"
-      type="org.lamsfoundation.lams.admin.web.UserSaveAction"
+      path="/user"
+      type="org.lamsfoundation.lams.admin.web.UserAction"
       name="UserForm"
       scope="request"
-      input=".user"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
         name="user"
-        path="/user.do?method=edit"
+        path=".user"
         redirect="false"
       />
       <forward
@@ -408,236 +374,384 @@
         redirect="false"
       />
       <forward
-        name="userroles"
-        path="/userroles.do"
+        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="/config"
-      type="org.lamsfoundation.lams.admin.web.ConfigAction"
-      name="ConfigForm"
+      path="/userorgrolesave"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleSaveAction"
+      name="UserOrgRoleForm"
+      scope="session"
+      input=".userorgrole"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
+      <forward
+        name="userorg"
+        path="/userorg.do"
+        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"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/timezonemanagement"
+      type="org.lamsfoundation.lams.admin.web.action.TimezoneManagementAction"
+      name="TimezoneForm"
       scope="request"
       input=".config"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="config"
-        path=".config"
+        name="timezoneManagement"
+        path=".timezoneManagement"
         redirect="false"
       />
       <forward
+        name="timezoneServerManagement"
+        path="/timezoneServerManagement.jsp"
+        redirect="false"
+      />
+      <forward
         name="sysadmin"
         path="/sysadminstart.do"
         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="/userroles"
-      type="org.lamsfoundation.lams.admin.web.UserRolesAction"
-      name="UserRolesForm"
+      path="/importuserresult"
+      type="org.lamsfoundation.lams.admin.web.action.ImportUserResultAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="importresult"
+        path=".importresult"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/servermaintain"
+      type="org.lamsfoundation.lams.admin.web.ServerMaintainAction"
+      name="ServerOrgMapForm"
       scope="request"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userrole"
-        path=".userrole"
+        name="servermaintain"
+        path=".servermaintain"
         redirect="false"
       />
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="serverlist"
+        path="/serverlist.do"
         redirect="false"
       />
     </action>
     <action
-      path="/loginsave"
-      type="org.lamsfoundation.lams.admin.web.LoginSaveAction"
-      name="LoginMaintainForm"
+      path="/importexcelsave"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelSaveAction"
+      name="ImportExcelForm"
       scope="request"
-      input=".loginmaintian"
-      parameter="method"
+      input=".importexcel"
       unknown="false"
       validate="false"
     >
       <forward
+        name="importresult"
+        path=".importresult"
+        redirect="false"
+      />
+      <forward
         name="sysadmin"
         path="/sysadminstart.do"
         redirect="false"
       />
       <forward
-        name="loginmaintain"
-        path=".loginmaintain"
+        name="import"
+        path="/importexcel.do"
         redirect="false"
       />
+      <forward
+        name="status"
+        path="/import/status.jsp"
+        redirect="false"
+      />
+      <forward
+        name="results"
+        path="/importuserresult.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/themeManagement"
-      type="org.lamsfoundation.lams.admin.web.action.ThemeManagementAction"
-      name="themeForm"
+      path="/importv1save"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1SaveAction"
+      name="ImportV1Form"
       scope="request"
-      input=".themeManagement"
-      parameter="method"
+      input=".importv1"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path=".themeManagement"
+        name="importv1contents"
+        path="/importv1contents.do"
         redirect="false"
       />
       <forward
-        name="error"
-        path=".error"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
+      <forward
+        name="importv1"
+        path="/importv1.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/userorgrolesave"
-      type="org.lamsfoundation.lams.admin.web.UserOrgRoleSaveAction"
-      name="UserOrgRoleForm"
-      scope="session"
-      input=".userorgrole"
+      path="/disabledmanage"
+      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="disabledlist"
+        path=".disabledlist"
         redirect="false"
       />
+    </action>
+    <action
+      path="/user/searchsingle"
+      type="org.lamsfoundation.lams.admin.web.action.UserSearchSingleTermAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="userorg"
-        path="/userorg.do"
+        name="basiclist"
+        path="/user/basiclist.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/user"
-      type="org.lamsfoundation.lams.admin.web.UserAction"
-      name="UserForm"
+      path="/ldap"
+      type="org.lamsfoundation.lams.admin.web.action.LdapConfigAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="ldap"
+        path=".ldap"
+        redirect="false"
+      />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/cleanup"
+      type="org.lamsfoundation.lams.admin.web.action.CleanupTempFilesAction"
+      name="CleanupForm"
       scope="request"
-      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="user"
-        path=".user"
+        name="cleanup"
+        path=".cleanup"
         redirect="false"
       />
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
+    </action>
+    <action
+      path="/userorg"
+      type="org.lamsfoundation.lams.admin.web.UserOrgAction"
+      name="UserOrgForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="remove"
-        path=".remove"
+        name="userorg"
+        path=".userorg"
         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="disabledlist"
-        path="/disabledmanage.do"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
       <forward
-        name="usersearch"
-        path="/usersearch.do"
+        name="userorgrole"
+        path="/userorgrole.do"
         redirect="false"
       />
     </action>
     <action
-      path="/user/basiclist"
-      type="org.lamsfoundation.lams.admin.web.action.UserBasicListAction"
+      path="/usersave"
+      type="org.lamsfoundation.lams.admin.web.UserSaveAction"
+      name="UserForm"
+      scope="request"
+      input=".user"
       unknown="false"
       validate="false"
     >
       <forward
-        name="basiclist"
-        path="/user/basiclist.jsp"
+        name="user"
+        path="/user.do?method=edit"
         redirect="false"
       />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
+      <forward
+        name="userroles"
+        path="/userroles.do"
+        redirect="false"
+      />
+      <forward
+        name="usersearch"
+        path="/usersearch.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/loginmaintain"
-      type="org.lamsfoundation.lams.admin.web.LoginMaintainAction"
+      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="/sysadminstart.do"
+        redirect="false"
+      />
+      <forward
         name="loginmaintain"
         path=".loginmaintain"
         redirect="false"
       />
     </action>
     <action
-      path="/timezonemanagement"
-      type="org.lamsfoundation.lams.admin.web.action.TimezoneManagementAction"
-      name="TimezoneForm"
+      path="/userroles"
+      type="org.lamsfoundation.lams.admin.web.UserRolesAction"
+      name="UserRolesForm"
       scope="request"
-      input=".config"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="timezonemanagement"
-        path=".timezonemanagement"
+        name="userrole"
+        path=".userrole"
         redirect="false"
       />
       <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
     </action>
     <action
-      path="/importv1contents"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsAction"
-      name="ImportV1ContentsForm"
-      scope="session"
+      path="/themeManagement"
+      type="org.lamsfoundation.lams.admin.web.action.ThemeManagementAction"
+      name="themeForm"
+      scope="request"
+      input=".themeManagement"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1contents"
-        path=".importv1contents"
+        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"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="loginmaintain"
+        path=".loginmaintain"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/joblist"
       type="org.lamsfoundation.lams.admin.web.ScheduledJobListAction"
       unknown="false"
@@ -650,16 +764,16 @@
       />
     </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
@@ -669,18 +783,23 @@
       />
     </action>
     <action
-      path="/importexcel"
-      type="org.lamsfoundation.lams.admin.web.ImportExcelAction"
-      name="ImportExcelForm"
+      path="/importgroups"
+      type="org.lamsfoundation.lams.admin.web.action.ImportGroupsAction"
+      name="ImportGroupsForm"
       scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importexcel"
-        path=".importexcel"
+        name="importGroups"
+        path=".importGroups"
         redirect="false"
       />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
     </action>
     <action
       path="/register"
@@ -714,14 +833,16 @@
       />
     </action>
     <action
-      path="/serverlist"
-      type="org.lamsfoundation.lams.admin.web.ServerListAction"
+      path="/importexcel"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelAction"
+      name="ImportExcelForm"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="serverlist"
-        path=".serverlist"
+        name="importexcel"
+        path=".importexcel"
         redirect="false"
       />
     </action>
@@ -740,18 +861,6 @@
       />
     </action>
     <action
-      path="/importuserresult"
-      type="org.lamsfoundation.lams.admin.web.action.ImportUserResultAction"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="importresult"
-        path=".importresult"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/orgsave"
       type="org.lamsfoundation.lams.admin.web.OrgSaveAction"
       name="OrganisationForm"
@@ -792,61 +901,38 @@
       />
     </action>
     <action
-      path="/importexcelsave"
-      type="org.lamsfoundation.lams.admin.web.ImportExcelSaveAction"
-      name="ImportExcelForm"
-      scope="request"
-      input=".importexcel"
+      path="/clone"
+      type="org.lamsfoundation.lams.admin.web.action.CloneLessonsAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importresult"
-        path=".importresult"
+        name="start"
+        path=".clone-start"
         redirect="false"
       />
       <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
+        name="availableLessonsPart"
+        path="/organisation/parts/availableLessons.jsp"
         redirect="false"
       />
       <forward
-        name="import"
-        path="/importexcel.do"
+        name="selectStaffPart"
+        path="/organisation/parts/selectStaff.jsp"
         redirect="false"
       />
       <forward
-        name="status"
-        path="/import/status.jsp"
+        name="selectLearnersPart"
+        path="/organisation/parts/selectLearners.jsp"
         redirect="false"
       />
       <forward
-        name="results"
-        path="/importuserresult.do"
+        name="result"
+        path=".clone-result"
         redirect="false"
       />
     </action>
     <action
-      path="/servermaintain"
-      type="org.lamsfoundation.lams.admin.web.ServerMaintainAction"
-      name="ServerOrgMapForm"
-      scope="request"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="servermaintain"
-        path=".servermaintain"
-        redirect="false"
-      />
-      <forward
-        name="serverlist"
-        path="/serverlist.do"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/userorgrole"
       type="org.lamsfoundation.lams.admin.web.UserOrgRoleAction"
       name="UserOrgRoleForm"
@@ -860,55 +946,6 @@
         redirect="false"
       />
     </action>
-    <action
-      path="/importv1save"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1SaveAction"
-      name="ImportV1Form"
-      scope="request"
-      input=".importv1"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="importv1contents"
-        path="/importv1contents.do"
-        redirect="false"
-      />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
-      <forward
-        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=".disabledlist"
-        redirect="false"
-      />
-    </action>
-    <action
-      path="/user/searchsingle"
-      type="org.lamsfoundation.lams.admin.web.action.UserSearchSingleTermAction"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="basiclist"
-        path="/user/basiclist.jsp"
-        redirect="false"
-      />
-    </action>
 
   </action-mappings>