Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -re454420ea2a36f92f3235fd684570b5d98b90cfe -re3e3144e95dcad1428633c3fce9304bd2e856d85 --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e454420ea2a36f92f3235fd684570b5d98b90cfe) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e3e3144e95dcad1428633c3fce9304bd2e856d85) @@ -213,20 +213,7 @@ sysadmin.library.activity.description =Description sysadmin.library.createtim =Create time sysadmin.function =Function -admin.importv1.title =Import LAMS 1 Users -msg.importv1.1 =Download -msg.importv1.2 =On the command line of your LAMS 1 database server, run the following command -msg.importv1.3a =Submit -msg.importv1.3b =using the form below. -msg.importv1.4 =You will be presented with a list of organisations and session classes to import. -label.importv1.integrated =Include integration users and organisations label.continue =Continue -msg.importv1.found.users =Found {0} LAMS 1 users. -heading.importv1.users =Users -heading.importv1.account.organisations =Account Organisations -heading.importv1.session.classes =Session Classes -msg.importv1.created =Created {0} users and {1} groups. -msg.importv1.already.exist =The following logins already exist msg.cleanup.files.deleted ={0} files were deleted. msg.cleanup.warning =Warning: calculating the size of LAMS' temporary files may incur a performance hit on your server if it hasn't been cleaned out for a while. label.exported.learning.designs =exported learning designs @@ -235,12 +222,9 @@ msg.cleanup.actual.space =Depending on your server's file system, the actual space occupied may differ from the above. msg.cleanup.recommended =It's recommended to leave at least 1 day of temporary files in order not to remove anything that's currently in use. label.cleanup.delete =Delete temporary files older than this number of days -msg.importv1.5 =Note that the passwords of the imported users will be reset, since LAMS 2 does not accept md5 passwords. They will be reset to the user's login. label.can.join.joint.lessons =Can join joint lessons label.can.offer.joint.lessons =Can offer joint lessons error.cant.write.login.jsp =Couldn''t write value of {0} to {1}, please check your {2} configuration. -msg.importv1.please.wait =Please wait while creating new users and groups... -msg.importv1.only.members =Only import users that are members of organisations/session classes to be imported label.login.as =Login as sysadmin.import.groups.title =Import Groups heading.import.results =Import Results Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1Action.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1ContentsAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1ContentsSaveAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1SaveAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java =================================================================== diff -u -r2b88dada3266a4b0f83f4b5c4cf617553496ca59 -re3e3144e95dcad1428633c3fce9304bd2e856d85 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java (.../SysAdminStartAction.java) (revision 2b88dada3266a4b0f83f4b5c4cf617553496ca59) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java (.../SysAdminStartAction.java) (revision e3e3144e95dcad1428633c3fce9304bd2e856d85) @@ -65,7 +65,6 @@ links.add(new LinkBean("usersearch.do", "admin.user.find")); links.add(new LinkBean("importgroups.do", "sysadmin.import.groups.title")); links.add(new LinkBean("importexcel.do", "admin.user.import")); - links.add(new LinkBean("importv1.do", "admin.importv1.title")); links.add(new LinkBean("ldap.do", "sysadmin.ldap.configuration")); links.add(new LinkBean("disabledmanage.do", "admin.list.disabled.users")); links.add(new LinkBean("loginmaintain.do", "sysadmin.maintain.loginpage")); @@ -88,7 +87,6 @@ links.add(linkBean); links.add(new LinkBean("importgroups.do", "sysadmin.import.groups.title")); links.add(new LinkBean("importexcel.do", "admin.user.import")); - links.add(new LinkBean("importv1.do", "admin.importv1.title")); links.add(new LinkBean("disabledmanage.do", "admin.list.disabled.users")); } else { request.setAttribute("errorName", "SysAdminStartAction"); Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/V1OrgRightDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/V1OrganisationDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/V1UserDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ImportV1ContentsForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ImportV1Form.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/web/file/lams1_user_org_export.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/web/import/importv1.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/web/import/importv1contents.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e3e3144e95dcad1428633c3fce9304bd2e856d85 refers to a dead (removed) revision in file `lams_admin/web/import/importv1result.jsp'. Fisheye: No comparison available. Pass `N' to diff?