Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r51767af10de37c113c0c7b5c0b793380bf2729a6 -rab19db088359a46353cc92e806c40ff5cff818b9
--- lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 51767af10de37c113c0c7b5c0b793380bf2729a6)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision ab19db088359a46353cc92e806c40ff5cff818b9)
@@ -22,10 +22,6 @@
       type="org.lamsfoundation.lams.admin.web.RegisterForm"
     />
     <form-bean
-      name="CacheActionForm"
-      type="org.lamsfoundation.lams.admin.web.CacheActionForm"
-    />
-    <form-bean
       name="OrgManageForm"
       type="org.lamsfoundation.lams.admin.web.form.OrgManageForm"
     />
@@ -34,17 +30,25 @@
       type="org.lamsfoundation.lams.admin.web.form.ImportV1ContentsForm"
     />
     <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="openIDForm"
+      type="org.lamsfoundation.lams.admin.web.OpenIDConfigForm"
+    />
+    <form-bean
       name="themeForm"
       type="org.lamsfoundation.lams.admin.web.form.ThemeForm"
     />
+    <form-bean
+      name="CacheActionForm"
+      type="org.lamsfoundation.lams.admin.web.CacheActionForm"
+    />
+    <form-bean
+      name="ImportV1Form"
+      type="org.lamsfoundation.lams.admin.web.form.ImportV1Form"
+    />
 
    <form-bean name="OrganisationForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="orgId" type="java.lang.Integer" />
@@ -165,110 +169,233 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/orgsave"
-      type="org.lamsfoundation.lams.admin.web.OrgSaveAction"
+      path="/orgmanage"
+      type="org.lamsfoundation.lams.admin.web.OrgManageAction"
+      name="OrgManageForm"
+      scope="request"
+      input=".orglist"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="orglist"
+        path=".orglist"
+        redirect="false"
+      />
+    </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="/libraryManage"
+      type="org.lamsfoundation.lams.admin.web.LibraryManageAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="success"
+        path=".librarylist"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/serverlist"
+      type="org.lamsfoundation.lams.admin.web.ServerListAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="serverlist"
+        path=".serverlist"
+        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
+      path="/cleanup"
+      type="org.lamsfoundation.lams.admin.web.action.CleanupTempFilesAction"
+      name="CleanupForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="cleanup"
+        path=".cleanup"
+        redirect="false"
+      />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/organisation"
+      type="org.lamsfoundation.lams.admin.web.OrganisationAction"
       name="OrganisationForm"
       scope="request"
-      input=".organisation"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
         name="organisation"
-        path="/organisation.do?method=edit"
+        path=".organisation"
         redirect="false"
       />
       <forward
+        name="organisationCourseAdmin"
+        path=".organisationCourseAdmin"
+        redirect="false"
+      />
+      <forward
         name="orglist"
         path="/orgmanage.do"
         redirect="false"
       />
+    </action>
+    <action
+      path="/userroles"
+      type="org.lamsfoundation.lams.admin.web.UserRolesAction"
+      name="UserRolesForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
       <forward
+        name="userrole"
+        path=".userrole"
+        redirect="false"
+      />
+      <forward
         name="userlist"
         path="/usermanage.do"
         redirect="false"
       />
     </action>
     <action
-      path="/usersearch"
-      type="org.lamsfoundation.lams.admin.web.UserSearchAction"
-      name="UserSearchForm"
+      path="/config"
+      type="org.lamsfoundation.lams.admin.web.ConfigAction"
+      name="ConfigForm"
       scope="request"
-      input=".usersearchlist"
+      input=".editconfig"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="usersearchlist"
-        path=".usersearchlist"
+        name="config"
+        path=".editconfig"
         redirect="false"
       />
+      <forward
+        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"
-      scope="request"
-      input=".orglist"
+      path="/joblist"
+      type="org.lamsfoundation.lams.admin.web.ScheduledJobListAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="orglist"
-        path=".orglist"
+        name="list"
+        path=".joblist"
         redirect="false"
       />
     </action>
     <action
-      path="/importv1contentssave"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsSaveAction"
-      name="ImportV1ContentsForm"
-      scope="session"
-      input=".importv1contents"
+      path="/importuserresult"
+      type="org.lamsfoundation.lams.admin.web.action.ImportUserResultAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1result"
-        path=".importv1result"
+        name="importresult"
+        path=".importresult"
         redirect="false"
       />
+    </action>
+    <action
+      path="/user/basiclist"
+      type="org.lamsfoundation.lams.admin.web.action.UserBasicListAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
+        name="basiclist"
+        path="/user/basiclist.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/libraryManage"
-      type="org.lamsfoundation.lams.admin.web.LibraryManageAction"
+      path="/disabledmanage"
+      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path=".librarylist"
+        name="disabledlist"
+        path=".disabledlist"
         redirect="false"
       />
     </action>
     <action
-      path="/statistics"
-      type="org.lamsfoundation.lams.admin.web.action.StatisticsAction"
-      name="statistics"
+      path="/cache"
+      type="org.lamsfoundation.lams.admin.web.CacheAction"
+      name="CacheActionForm"
       scope="request"
-      input=".statistics"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path=".statistics"
+        name="cache"
+        path=".cache"
         redirect="false"
       />
+    </action>
+    <action
+      path="/toolcontentlist"
+      type="org.lamsfoundation.lams.admin.web.ToolContentListAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="groupStats"
-        path="/groupStatistics.jsp"
+        name="toolcontentlist"
+        path=".toolcontentlist"
         redirect="false"
       />
       <forward
@@ -278,82 +405,176 @@
       />
     </action>
     <action
-      path="/serverlist"
-      type="org.lamsfoundation.lams.admin.web.ServerListAction"
+      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"
+        path="/serverlist.do"
         redirect="false"
       />
     </action>
     <action
-      path="/user/searchsingle"
-      type="org.lamsfoundation.lams.admin.web.action.UserSearchSingleTermAction"
+      path="/userorg"
+      type="org.lamsfoundation.lams.admin.web.UserOrgAction"
+      name="UserOrgForm"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="basiclist"
-        path="/user/basiclist.jsp"
+        name="userorg"
+        path=".userorg"
         redirect="false"
       />
     </action>
     <action
-      path="/importexcelsave"
-      type="org.lamsfoundation.lams.admin.web.ImportExcelSaveAction"
-      name="ImportExcelForm"
+      path="/clone"
+      type="org.lamsfoundation.lams.admin.web.action.CloneLessonsAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="start"
+        path=".clone-start"
+        redirect="false"
+      />
+      <forward
+        name="availableLessonsPart"
+        path="/organisation/parts/availableLessons.jsp"
+        redirect="false"
+      />
+      <forward
+        name="selectStaffPart"
+        path="/organisation/parts/selectStaff.jsp"
+        redirect="false"
+      />
+      <forward
+        name="selectLearnersPart"
+        path="/organisation/parts/selectLearners.jsp"
+        redirect="false"
+      />
+      <forward
+        name="result"
+        path=".clone-result"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/orgsave"
+      type="org.lamsfoundation.lams.admin.web.OrgSaveAction"
+      name="OrganisationForm"
       scope="request"
-      input=".importexcel"
+      input=".organisation"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importresult"
-        path=".importresult"
+        name="organisation"
+        path="/organisation.do?method=edit"
         redirect="false"
       />
       <forward
+        name="orglist"
+        path="/orgmanage.do"
+        redirect="false"
+      />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/importv1contentssave"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsSaveAction"
+      name="ImportV1ContentsForm"
+      scope="session"
+      input=".importv1contents"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="importv1result"
+        path=".importv1result"
+        redirect="false"
+      />
+      <forward
         name="sysadmin"
         path="/sysadminstart.do"
         redirect="false"
       />
+    </action>
+    <action
+      path="/statistics"
+      type="org.lamsfoundation.lams.admin.web.action.StatisticsAction"
+      name="statistics"
+      scope="request"
+      input=".statistics"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="import"
-        path="/importexcel.do"
+        name="success"
+        path=".statistics"
         redirect="false"
       />
       <forward
-        name="status"
-        path="/import/status.jsp"
+        name="groupStats"
+        path="/groupStatistics.jsp"
         redirect="false"
       />
       <forward
-        name="results"
-        path="/importuserresult.do"
+        name="error"
+        path=".error"
         redirect="false"
       />
     </action>
     <action
-      path="/cleanup"
-      type="org.lamsfoundation.lams.admin.web.action.CleanupTempFilesAction"
-      name="CleanupForm"
+      path="/importexcelsave"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelSaveAction"
+      name="ImportExcelForm"
       scope="request"
+      input=".importexcel"
       unknown="false"
       validate="false"
     >
       <forward
-        name="cleanup"
-        path=".cleanup"
+        name="importresult"
+        path=".importresult"
         redirect="false"
       />
       <forward
         name="sysadmin"
         path="/sysadminstart.do"
         redirect="false"
       />
+      <forward
+        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="/usersave"
@@ -438,72 +659,6 @@
       />
     </action>
     <action
-      path="/userroles"
-      type="org.lamsfoundation.lams.admin.web.UserRolesAction"
-      name="UserRolesForm"
-      scope="request"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="userrole"
-        path=".userrole"
-        redirect="false"
-      />
-      <forward
-        name="userlist"
-        path="/usermanage.do"
-        redirect="false"
-      />
-    </action>
-    <action
-      path="/organisation"
-      type="org.lamsfoundation.lams.admin.web.OrganisationAction"
-      name="OrganisationForm"
-      scope="request"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="organisation"
-        path=".organisation"
-        redirect="false"
-      />
-      <forward
-        name="organisationCourseAdmin"
-        path=".organisationCourseAdmin"
-        redirect="false"
-      />
-      <forward
-        name="orglist"
-        path="/orgmanage.do"
-        redirect="false"
-      />
-    </action>
-    <action
-      path="/config"
-      type="org.lamsfoundation.lams.admin.web.ConfigAction"
-      name="ConfigForm"
-      scope="request"
-      input=".config"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="config"
-        path=".config"
-        redirect="false"
-      />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/loginmaintain"
       type="org.lamsfoundation.lams.admin.web.LoginMaintainAction"
       name="LoginMaintainForm"
@@ -612,30 +767,6 @@
       />
     </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="/importuserresult"
-      type="org.lamsfoundation.lams.admin.web.action.ImportUserResultAction"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="importresult"
-        path=".importresult"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/themeManagement"
       type="org.lamsfoundation.lams.admin.web.action.ThemeManagementAction"
       name="themeForm"
@@ -657,30 +788,6 @@
       />
     </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="/userorgrolesave"
       type="org.lamsfoundation.lams.admin.web.UserOrgRoleSaveAction"
       name="UserOrgRoleForm"
@@ -701,21 +808,6 @@
       />
     </action>
     <action
-      path="/cache"
-      type="org.lamsfoundation.lams.admin.web.CacheAction"
-      name="CacheActionForm"
-      scope="request"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="cache"
-        path=".cache"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/ldap"
       type="org.lamsfoundation.lams.admin.web.action.LdapConfigAction"
       unknown="false"
@@ -733,57 +825,6 @@
       />
     </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"
-      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="/importexcel"
-      type="org.lamsfoundation.lams.admin.web.ImportExcelAction"
-      name="ImportExcelForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="importexcel"
-        path=".importexcel"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/register"
       type="org.lamsfoundation.lams.admin.web.RegisterAction"
       name="RegisterForm"
@@ -815,6 +856,20 @@
       />
     </action>
     <action
+      path="/importexcel"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelAction"
+      name="ImportExcelForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="importexcel"
+        path=".importexcel"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/usermanage"
       type="org.lamsfoundation.lams.admin.web.UserManageAction"
       unknown="false"
@@ -847,6 +902,26 @@
       />
     </action>
     <action
+      path="/openIDConfig"
+      type="org.lamsfoundation.lams.admin.web.OpenIDConfigAction"
+      name="openIDForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="config"
+        path="/openidConfig.jsp"
+        redirect="false"
+      />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/userorgrole"
       type="org.lamsfoundation.lams.admin.web.UserOrgRoleAction"
       name="UserOrgRoleForm"
@@ -895,20 +970,6 @@
         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"
-        redirect="false"
-      />
-    </action>
 
   </action-mappings>