Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rab19db088359a46353cc92e806c40ff5cff818b9 -r389bb9c0679d86c2446517dbe83a46b6ab5dc840
--- lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision ab19db088359a46353cc92e806c40ff5cff818b9)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 389bb9c0679d86c2446517dbe83a46b6ab5dc840)
@@ -14,41 +14,45 @@
   <form-beans>
 
     <form-bean
-      name="UserOrgRoleForm"
-      type="org.lamsfoundation.lams.admin.web.UserOrgRoleForm"
+      name="ImportExcelForm"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelForm"
     />
     <form-bean
-      name="RegisterForm"
-      type="org.lamsfoundation.lams.admin.web.RegisterForm"
-    />
-    <form-bean
       name="OrgManageForm"
       type="org.lamsfoundation.lams.admin.web.form.OrgManageForm"
     />
     <form-bean
-      name="ImportV1ContentsForm"
-      type="org.lamsfoundation.lams.admin.web.form.ImportV1ContentsForm"
+      name="ImportV1Form"
+      type="org.lamsfoundation.lams.admin.web.form.ImportV1Form"
     />
     <form-bean
-      name="ImportExcelForm"
-      type="org.lamsfoundation.lams.admin.web.ImportExcelForm"
+      name="emailForm"
+      type="org.lamsfoundation.lams.admin.web.form.EmailForm"
     />
     <form-bean
-      name="openIDForm"
-      type="org.lamsfoundation.lams.admin.web.OpenIDConfigForm"
+      name="RegisterForm"
+      type="org.lamsfoundation.lams.admin.web.RegisterForm"
     />
     <form-bean
       name="themeForm"
       type="org.lamsfoundation.lams.admin.web.form.ThemeForm"
     />
     <form-bean
-      name="CacheActionForm"
-      type="org.lamsfoundation.lams.admin.web.CacheActionForm"
+      name="UserOrgRoleForm"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleForm"
     />
     <form-bean
-      name="ImportV1Form"
-      type="org.lamsfoundation.lams.admin.web.form.ImportV1Form"
+      name="openIDForm"
+      type="org.lamsfoundation.lams.admin.web.OpenIDConfigForm"
     />
+    <form-bean
+      name="ImportV1ContentsForm"
+      type="org.lamsfoundation.lams.admin.web.form.ImportV1ContentsForm"
+    />
+    <form-bean
+      name="CacheActionForm"
+      type="org.lamsfoundation.lams.admin.web.CacheActionForm"
+    />
 
    <form-bean name="OrganisationForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="orgId" type="java.lang.Integer" />
@@ -169,89 +173,104 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/orgmanage"
-      type="org.lamsfoundation.lams.admin.web.OrgManageAction"
-      name="OrgManageForm"
-      scope="request"
-      input=".orglist"
+      path="/libraryManage"
+      type="org.lamsfoundation.lams.admin.web.LibraryManageAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="orglist"
-        path=".orglist"
+        name="success"
+        path=".librarylist"
         redirect="false"
       />
     </action>
     <action
-      path="/usersearch"
-      type="org.lamsfoundation.lams.admin.web.UserSearchAction"
-      name="UserSearchForm"
+      path="/userrolessave"
+      type="org.lamsfoundation.lams.admin.web.UserRolesSaveAction"
+      name="UserRolesForm"
       scope="request"
-      input=".usersearchlist"
+      input=".userroles"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="usersearchlist"
-        path=".usersearchlist"
+        name="userroles"
+        path="/userroles.do"
         redirect="false"
       />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/libraryManage"
-      type="org.lamsfoundation.lams.admin.web.LibraryManageAction"
+      path="/emailUser"
+      type="org.lamsfoundation.lams.admin.web.action.EmailUserAction"
+      name="emailForm"
+      scope="request"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path=".librarylist"
+        name="emailuser"
+        path=".emailuser"
         redirect="false"
       />
+      <forward
+        name="usersearch"
+        path="/usersearch.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/serverlist"
-      type="org.lamsfoundation.lams.admin.web.ServerListAction"
+      path="/sysadminstart"
+      type="org.lamsfoundation.lams.admin.web.action.SysAdminStartAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="serverlist"
-        path=".serverlist"
+        name="sysadmin"
+        path=".sysadmin"
         redirect="false"
       />
     </action>
     <action
-      path="/user/searchsingle"
-      type="org.lamsfoundation.lams.admin.web.action.UserSearchSingleTermAction"
+      path="/importv1contentssave"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsSaveAction"
+      name="ImportV1ContentsForm"
+      scope="session"
+      input=".importv1contents"
       unknown="false"
       validate="false"
     >
       <forward
-        name="basiclist"
-        path="/user/basiclist.jsp"
+        name="importv1result"
+        path=".importv1result"
         redirect="false"
       />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/cleanup"
-      type="org.lamsfoundation.lams.admin.web.action.CleanupTempFilesAction"
-      name="CleanupForm"
+      path="/usersearch"
+      type="org.lamsfoundation.lams.admin.web.UserSearchAction"
+      name="UserSearchForm"
       scope="request"
+      input=".usersearchlist"
       unknown="false"
       validate="false"
     >
       <forward
-        name="cleanup"
-        path=".cleanup"
+        name="usersearchlist"
+        path=".usersearchlist"
         redirect="false"
       />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
     </action>
     <action
       path="/organisation"
@@ -279,100 +298,50 @@
       />
     </action>
     <action
-      path="/userroles"
-      type="org.lamsfoundation.lams.admin.web.UserRolesAction"
-      name="UserRolesForm"
-      scope="request"
-      parameter="method"
+      path="/usermanage"
+      type="org.lamsfoundation.lams.admin.web.UserManageAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userrole"
-        path=".userrole"
-        redirect="false"
-      />
-      <forward
         name="userlist"
-        path="/usermanage.do"
+        path=".userlist"
         redirect="false"
       />
     </action>
     <action
-      path="/config"
-      type="org.lamsfoundation.lams.admin.web.ConfigAction"
-      name="ConfigForm"
+      path="/serversave"
+      type="org.lamsfoundation.lams.admin.web.ServerSaveAction"
+      name="ServerOrgMapForm"
       scope="request"
-      input=".editconfig"
-      parameter="method"
+      input=".servermaintain"
       unknown="false"
       validate="false"
     >
       <forward
-        name="config"
-        path=".editconfig"
+        name="success"
+        path="/serverlist.do"
         redirect="false"
       />
-      <forward
-        name="ldap"
-        path=".ldap"
-        redirect="false"
-      />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
     </action>
     <action
-      path="/joblist"
-      type="org.lamsfoundation.lams.admin.web.ScheduledJobListAction"
+      path="/toolcontentlist"
+      type="org.lamsfoundation.lams.admin.web.ToolContentListAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="list"
-        path=".joblist"
+        name="toolcontentlist"
+        path=".toolcontentlist"
         redirect="false"
       />
-    </action>
-    <action
-      path="/importuserresult"
-      type="org.lamsfoundation.lams.admin.web.action.ImportUserResultAction"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="importresult"
-        path=".importresult"
+        name="error"
+        path=".error"
         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="/disabledmanage"
-      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="disabledlist"
-        path=".disabledlist"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/cache"
       type="org.lamsfoundation.lams.admin.web.CacheAction"
       name="CacheActionForm"
@@ -388,130 +357,119 @@
       />
     </action>
     <action
-      path="/toolcontentlist"
-      type="org.lamsfoundation.lams.admin.web.ToolContentListAction"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="toolcontentlist"
-        path=".toolcontentlist"
-        redirect="false"
-      />
-      <forward
-        name="error"
-        path=".error"
-        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=".editconfig"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="servermaintain"
-        path=".servermaintain"
+        name="config"
+        path=".editconfig"
         redirect="false"
       />
       <forward
-        name="serverlist"
-        path="/serverlist.do"
+        name="ldap"
+        path=".ldap"
         redirect="false"
       />
-    </action>
-    <action
-      path="/userorg"
-      type="org.lamsfoundation.lams.admin.web.UserOrgAction"
-      name="UserOrgForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="userorg"
-        path=".userorg"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
     <action
-      path="/clone"
-      type="org.lamsfoundation.lams.admin.web.action.CloneLessonsAction"
+      path="/user"
+      type="org.lamsfoundation.lams.admin.web.UserAction"
+      name="UserForm"
+      scope="request"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="start"
-        path=".clone-start"
+        name="user"
+        path=".user"
         redirect="false"
       />
       <forward
-        name="availableLessonsPart"
-        path="/organisation/parts/availableLessons.jsp"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
       <forward
-        name="selectStaffPart"
-        path="/organisation/parts/selectStaff.jsp"
+        name="remove"
+        path=".remove"
         redirect="false"
       />
       <forward
-        name="selectLearnersPart"
-        path="/organisation/parts/selectLearners.jsp"
+        name="disabledlist"
+        path="/disabledmanage.do"
         redirect="false"
       />
       <forward
-        name="result"
-        path=".clone-result"
+        name="usersearch"
+        path="/usersearch.do"
         redirect="false"
       />
     </action>
     <action
-      path="/orgsave"
-      type="org.lamsfoundation.lams.admin.web.OrgSaveAction"
-      name="OrganisationForm"
-      scope="request"
-      input=".organisation"
+      path="/userorgrolesave"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleSaveAction"
+      name="UserOrgRoleForm"
+      scope="session"
+      input=".userorgrole"
       unknown="false"
       validate="false"
     >
       <forward
-        name="organisation"
-        path="/organisation.do?method=edit"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
       <forward
-        name="orglist"
-        path="/orgmanage.do"
+        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="userlist"
-        path="/usermanage.do"
+        name="basiclist"
+        path="/user/basiclist.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/importv1contentssave"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsSaveAction"
-      name="ImportV1ContentsForm"
-      scope="session"
-      input=".importv1contents"
+      path="/serverlist"
+      type="org.lamsfoundation.lams.admin.web.ServerListAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1result"
-        path=".importv1result"
+        name="serverlist"
+        path=".serverlist"
         redirect="false"
       />
+    </action>
+    <action
+      path="/importuserresult"
+      type="org.lamsfoundation.lams.admin.web.action.ImportUserResultAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
+        name="importresult"
+        path=".importresult"
         redirect="false"
       />
     </action>
@@ -542,6 +500,26 @@
       />
     </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="/importexcelsave"
       type="org.lamsfoundation.lams.admin.web.ImportExcelSaveAction"
       name="ImportExcelForm"
@@ -577,140 +555,173 @@
       />
     </action>
     <action
-      path="/usersave"
-      type="org.lamsfoundation.lams.admin.web.UserSaveAction"
-      name="UserForm"
+      path="/importv1save"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1SaveAction"
+      name="ImportV1Form"
       scope="request"
-      input=".user"
+      input=".importv1"
       unknown="false"
       validate="false"
     >
       <forward
-        name="user"
-        path="/user.do?method=edit"
+        name="importv1contents"
+        path="/importv1contents.do"
         redirect="false"
       />
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
       <forward
-        name="userroles"
-        path="/userroles.do"
+        name="importv1"
+        path="/importv1.do"
         redirect="false"
       />
+    </action>
+    <action
+      path="/disabledmanage"
+      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="usersearch"
-        path="/usersearch.do"
+        name="disabledlist"
+        path=".disabledlist"
         redirect="false"
       />
     </action>
     <action
-      path="/serversave"
-      type="org.lamsfoundation.lams.admin.web.ServerSaveAction"
-      name="ServerOrgMapForm"
-      scope="request"
-      input=".servermaintain"
+      path="/user/searchsingle"
+      type="org.lamsfoundation.lams.admin.web.action.UserSearchSingleTermAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path="/serverlist.do"
+        name="basiclist"
+        path="/user/basiclist.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/sysadminstart"
-      type="org.lamsfoundation.lams.admin.web.action.SysAdminStartAction"
+      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=".sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
     <action
-      path="/importv1save"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1SaveAction"
-      name="ImportV1Form"
+      path="/cleanup"
+      type="org.lamsfoundation.lams.admin.web.action.CleanupTempFilesAction"
+      name="CleanupForm"
       scope="request"
-      input=".importv1"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1contents"
-        path="/importv1contents.do"
+        name="cleanup"
+        path=".cleanup"
         redirect="false"
       />
       <forward
         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="importv1"
-        path="/importv1.do"
+        name="userorg"
+        path=".userorg"
         redirect="false"
       />
     </action>
     <action
-      path="/loginmaintain"
-      type="org.lamsfoundation.lams.admin.web.LoginMaintainAction"
-      name="LoginMaintainForm"
+      path="/userorgsave"
+      type="org.lamsfoundation.lams.admin.web.UserOrgSaveAction"
+      name="UserOrgForm"
       scope="request"
+      input=".userorg"
       unknown="false"
       validate="false"
     >
       <forward
-        name="loginmaintain"
-        path=".loginmaintain"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
+      <forward
+        name="userorgrole"
+        path="/userorgrole.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/userrolessave"
-      type="org.lamsfoundation.lams.admin.web.UserRolesSaveAction"
-      name="UserRolesForm"
+      path="/openIDConfig"
+      type="org.lamsfoundation.lams.admin.web.OpenIDConfigAction"
+      name="openIDForm"
       scope="request"
-      input=".userroles"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userroles"
-        path="/userroles.do"
+        name="config"
+        path="/openidConfig.jsp"
         redirect="false"
       />
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
     <action
-      path="/importv1contents"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsAction"
-      name="ImportV1ContentsForm"
-      scope="session"
+      path="/usersave"
+      type="org.lamsfoundation.lams.admin.web.UserSaveAction"
+      name="UserForm"
+      scope="request"
+      input=".user"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1contents"
-        path=".importv1contents"
+        name="user"
+        path="/user.do?method=edit"
         redirect="false"
       />
       <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
+        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="/loginsave"
@@ -734,37 +745,24 @@
       />
     </action>
     <action
-      path="/importv1"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1Action"
-      name="ImportV1Form"
+      path="/userroles"
+      type="org.lamsfoundation.lams.admin.web.UserRolesAction"
+      name="UserRolesForm"
       scope="request"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1"
-        path=".importv1"
+        name="userrole"
+        path=".userrole"
         redirect="false"
       />
-    </action>
-    <action
-      path="/importgroups"
-      type="org.lamsfoundation.lams.admin.web.action.ImportGroupsAction"
-      name="ImportGroupsForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="importGroups"
-        path=".importGroups"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
     </action>
     <action
       path="/themeManagement"
@@ -788,34 +786,61 @@
       />
     </action>
     <action
-      path="/userorgrolesave"
-      type="org.lamsfoundation.lams.admin.web.UserOrgRoleSaveAction"
-      name="UserOrgRoleForm"
+      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"
+      validate="false"
+    >
+      <forward
+        name="list"
+        path=".joblist"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/importv1contents"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsAction"
+      name="ImportV1ContentsForm"
       scope="session"
-      input=".userorgrole"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="importv1contents"
+        path=".importv1contents"
         redirect="false"
       />
       <forward
-        name="userorg"
-        path="/userorg.do"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
     <action
-      path="/ldap"
-      type="org.lamsfoundation.lams.admin.web.action.LdapConfigAction"
+      path="/importgroups"
+      type="org.lamsfoundation.lams.admin.web.action.ImportGroupsAction"
+      name="ImportGroupsForm"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="ldap"
-        path=".ldap"
+        name="importGroups"
+        path=".importGroups"
         redirect="false"
       />
       <forward
@@ -870,103 +895,102 @@
       />
     </action>
     <action
-      path="/usermanage"
-      type="org.lamsfoundation.lams.admin.web.UserManageAction"
+      path="/importv1"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1Action"
+      name="ImportV1Form"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path=".userlist"
+        name="importv1"
+        path=".importv1"
         redirect="false"
       />
     </action>
     <action
-      path="/userorgsave"
-      type="org.lamsfoundation.lams.admin.web.UserOrgSaveAction"
-      name="UserOrgForm"
+      path="/orgsave"
+      type="org.lamsfoundation.lams.admin.web.OrgSaveAction"
+      name="OrganisationForm"
       scope="request"
-      input=".userorg"
+      input=".organisation"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="organisation"
+        path="/organisation.do?method=edit"
         redirect="false"
       />
       <forward
-        name="userorgrole"
-        path="/userorgrole.do"
+        name="orglist"
+        path="/orgmanage.do"
         redirect="false"
       />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/openIDConfig"
-      type="org.lamsfoundation.lams.admin.web.OpenIDConfigAction"
-      name="openIDForm"
+      path="/orgmanage"
+      type="org.lamsfoundation.lams.admin.web.OrgManageAction"
+      name="OrgManageForm"
       scope="request"
-      parameter="method"
+      input=".orglist"
       unknown="false"
       validate="false"
     >
       <forward
-        name="config"
-        path="/openidConfig.jsp"
+        name="orglist"
+        path=".orglist"
         redirect="false"
       />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
     </action>
     <action
-      path="/userorgrole"
-      type="org.lamsfoundation.lams.admin.web.UserOrgRoleAction"
-      name="UserOrgRoleForm"
-      scope="session"
+      path="/clone"
+      type="org.lamsfoundation.lams.admin.web.action.CloneLessonsAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userorgrole"
-        path=".userorgrole"
+        name="start"
+        path=".clone-start"
         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"
+        name="availableLessonsPart"
+        path="/organisation/parts/availableLessons.jsp"
         redirect="false"
       />
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="selectStaffPart"
+        path="/organisation/parts/selectStaff.jsp"
         redirect="false"
       />
       <forward
-        name="remove"
-        path=".remove"
+        name="selectLearnersPart"
+        path="/organisation/parts/selectLearners.jsp"
         redirect="false"
       />
       <forward
-        name="disabledlist"
-        path="/disabledmanage.do"
+        name="result"
+        path=".clone-result"
         redirect="false"
       />
+    </action>
+    <action
+      path="/userorgrole"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleAction"
+      name="UserOrgRoleForm"
+      scope="session"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="usersearch"
-        path="/usersearch.do"
+        name="userorgrole"
+        path=".userorgrole"
         redirect="false"
       />
     </action>