Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rd0de65cc054fe3d424e7d58d4ce75826d14ad5a6 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision d0de65cc054fe3d424e7d58d4ce75826d14ad5a6) +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -137,7 +137,6 @@ admin.search =Search admin.enable =Enable admin.disable =Disable -admin.register =Register sysadmin.maintain =Maintain LAMS sysadmin.maintain.loginpage =Maintain login page sysadmin.maintain.external.servers =Maintain integrated servers @@ -162,7 +161,6 @@ sysadmin.batch.temp.file.delete =Delete old temporary files sysadmin.job.list =Job list sysadmin.list.job =List scheduled jobs in Quartz queue -sysadmin.register.server =Register server sysadmin.edit.default.tool.content =Edit default tool content cache.maintain =Maintain LAMS cache cache.title =Cache management @@ -173,19 +171,6 @@ cache.button.remove =Remove admin.config.key =Key admin.config.value =Value -admin.register.sitename =Full sitename -admin.register.orgname =Organisation -admin.register.directory =Enable public directory -admin.register.directory.public =Public -admin.register.directory.private =Private -admin.register.heading.title =Register your server with the LAMS Community -admin.register.server.config.title =Server configuration -admin.register.server.stats.title =Server statistics -admin.register.server.config.url =Server URL -admin.register.server.config.version =Server version -admin.register.server.config.build =Server build no. -admin.register.server.config.locale =Server language (Locale) -admin.register.server.config.langdate =Language date label.show.all.users =Show all users msg.group.organisation_id =The organisation_id of this course is msg.subgroup.organisation_id =The organisation_id of this subcourse is @@ -197,7 +182,6 @@ msg.import.2 =Download the user template to create users. msg.import.conclusion =Click the help icon above for more information. label.results.per.page =Results per page -admin.register.server.stats.total.users =Total # of users msg.import.3 =Download the roles template to add users to course/subcourse and assign their roles. error.user.does.not.exist =User does not exist {0} msg.users.created ={0} users were created successfully. @@ -278,7 +262,6 @@ config.xmpp.admin =Chat server admin username config.xmpp.password =Chat server admin password config.allow.direct.lesson.launch =Allow direct lesson launch -config.community.enable =Enable LAMS community config.allow.live.edit =Allow Live Edit config.ldap.provisioning.enabled =Enable provisioning config.ldap.provider.url =LDAP server URL @@ -344,12 +327,6 @@ admin.user.authentication.method =Authentication method config.smtp.user =SMTP user config.smtp.password =SMTP password -admin.register.enableLamsCommunity =Enable lamscommunity.org integration -register.error.field =Required field -register.error.emailRequiredValid =Email is required in valid format -register.success =Your server has successfully been registered with lamscommunity.org. -register.error.noResponseFromLamsCommunity =Did not get a response from lamscommunity.org. -register.error.registrationFailed =Registration has failed. config.header.red5 =Media server config.red5.server.url =Media server URL config.red5.recordings.url =Media server recordings URL Fisheye: Tag 60e44b19b8de02a00faa437fba8117928baa3d73 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 60e44b19b8de02a00faa437fba8117928baa3d73 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 60e44b19b8de02a00faa437fba8117928baa3d73 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/StatisticsAction.java =================================================================== diff -u -rc92ea51a973dc03ece970c057dd9369eda6a8c24 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/StatisticsAction.java (.../StatisticsAction.java) (revision c92ea51a973dc03ece970c057dd9369eda6a8c24) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/StatisticsAction.java (.../StatisticsAction.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -39,15 +39,9 @@ import org.lamsfoundation.lams.web.action.LamsDispatchAction; /** + * Gives the overall statistics for a LAMS server + * * @author Luke Foxton - * - * Gives the overall statistics for a LAMS server - * - * - * - * - * - * */ public class StatisticsAction extends LamsDispatchAction { @@ -59,7 +53,7 @@ // check permission if (!request.isUserInRole(Role.SYSADMIN)) { - request.setAttribute("errorName", "RegisterAction"); + request.setAttribute("errorName", "StatisticsAction"); request.setAttribute("errorMessage", AdminServiceProxy.getMessageService(getServlet().getServletContext()) .getMessage("error.authorisation")); return mapping.findForward("error"); @@ -85,7 +79,7 @@ // check permission if (!request.isUserInRole(Role.SYSADMIN)) { - request.setAttribute("errorName", "RegisterAction"); + request.setAttribute("errorName", "StatisticsAction"); request.setAttribute("errorMessage", AdminServiceProxy.getMessageService(getServlet().getServletContext()) .getMessage("error.authorisation")); return mapping.findForward("error"); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java =================================================================== diff -u -rf4e34e708b87e42dea1b6d667135f09840d79aa3 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java (.../SysAdminStartAction.java) (revision f4e34e708b87e42dea1b6d667135f09840d79aa3) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java (.../SysAdminStartAction.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -61,7 +61,6 @@ links.add(new LinkBean("signupManagement.do", "admin.signup.title")); links.add(new LinkBean("serverlist.do", "sysadmin.maintain.external.servers")); links.add(new LinkBean("ltiConsumerManagement.do", "label.manage.tool.consumers")); - links.add(new LinkBean("register.do", "sysadmin.register.server")); links.add(new LinkBean("toolcontentlist.do", "sysadmin.tool.management")); links.add(new LinkBean("themeManagement.do", "admin.themes.title")); groupedLinks.add(new Object[]{AdminConstants.START_CONFIG_LINKS,links}); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java =================================================================== diff -u -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java (.../ThemeManagementAction.java) (revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java (.../ThemeManagementAction.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -43,14 +43,9 @@ import org.springframework.web.context.support.WebApplicationContextUtils; /** + * Actions for maintaining and altering system themes + * * @author Luke Foxton - * - * Actions for maintaining and altering system themes - * - * - * - * - * */ public class ThemeManagementAction extends LamsDispatchAction { @@ -63,7 +58,7 @@ // check permission if (!request.isUserInRole(Role.SYSADMIN)) { - request.setAttribute("errorName", "RegisterAction"); + request.setAttribute("errorName", "ThemeManagementAction"); request.setAttribute("errorMessage", AdminServiceProxy.getMessageService(getServlet().getServletContext()) .getMessage("error.authorisation")); return mapping.findForward("error"); Index: lams_admin/web/WEB-INF/struts-config.xml =================================================================== diff -u -r4eb868dc66707921b3f0b57cdb909cc9530b45b8 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_admin/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 4eb868dc66707921b3f0b57cdb909cc9530b45b8) +++ lams_admin/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -18,10 +18,6 @@ type="org.lamsfoundation.lams.admin.web.form.OrgManageForm" /> - @@ -595,37 +591,6 @@ /> - - - - - - - - - - - Fisheye: Tag 60e44b19b8de02a00faa437fba8117928baa3d73 refers to a dead (removed) revision in file `lams_admin/web/register.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java (.../ExportToolContentAction.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java (.../ExportToolContentAction.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -49,16 +49,9 @@ import org.springframework.web.context.support.WebApplicationContextUtils; /** - * - * - * - * - * - * * Export tool content action. It needs learingDesignID as input parameter. * * @author Steve.Ni - * @version $Revision$ */ public class ExportToolContentAction extends LamsAction { Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java (.../ImportToolContentAction.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java (.../ImportToolContentAction.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -24,11 +24,7 @@ package org.lamsfoundation.lams.authoring.web; -import java.io.BufferedOutputStream; import java.io.File; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.io.OutputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -47,32 +43,20 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.config.Registration; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsAction; -import org.lamsfoundation.lams.web.lamscommunity.LamsCommunityUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; /** - * * - * - * - * - * - * - * - * - * * Import tool content servlet. It needs an uploaded learning design zip file. * * @author Steve.Ni @@ -83,7 +67,6 @@ public static final String USER_SERVICE_BEAN_NAME = "userManagementService"; public static final String MESSAGE_SERVICE_BEAN_NAME = "authoringMessageService"; public static final String PARAM_LEARING_DESIGN_ID = "learningDesignID"; - public static final String PARAM_LEARNING_DESIGN_LOCATION = "ldLocation"; public static final String PARAM_LEARNING_FILE_NAME = "fileName"; public static final String ATTR_TOOLS_ERROR_MESSAGE = "toolsErrorMessages"; public static final String ATTR_LD_ERROR_MESSAGE = "ldErrorMessages"; @@ -106,29 +89,6 @@ } //display initial page for upload return mapping.findForward("upload"); - } else if (StringUtils.equals(param, "importLC")) { - // Checking the server is registered - Registration reg = Configuration.getRegistration(); - if (reg == null || reg.isEnableLamsCommunityIntegration() == false) { - request.setAttribute("registered", Boolean.FALSE); - } else { - request.setAttribute("registered", Boolean.TRUE); - } - - // import from lams community, redirect to sso page - if (customCSV != null) { - request.setAttribute(AttributeNames.PARAM_CUSTOM_CSV, customCSV); - } - //display initial lamscommunity import - return mapping.findForward("importLC"); - } else if (StringUtils.equals(param, "importLCFinish")) { - - // uploading the file from lams commmunity, have to feed the - // location from the request - String learningDesignLocation = WebUtil.readStrParam(request, PARAM_LEARNING_DESIGN_LOCATION); - - importLDFromURL(request, learningDesignLocation, customCSV); - return mapping.findForward("successLC"); } else { importLD(request); return mapping.findForward("success"); @@ -221,92 +181,6 @@ } - /** - * Import a LD from a url. - * - * @param request - */ - @SuppressWarnings("unchecked") - private void importLDFromURL(HttpServletRequest request, String learningDesignLocation, String customCSV) { - - List ldErrorMsgs = new ArrayList(); - List toolsErrorMsgs = new ArrayList(); - Long ldId = null; - - String fileExt = WebUtil.readStrParam(request, "ext"); - String fileName = FileUtil.generateUniqueContentFolderID() + "." + fileExt; - - try { - //get shared session - HttpSession ss = SessionManager.getSession(); - //get back login user DTO - UserDTO userDto = (UserDTO) ss.getAttribute(AttributeNames.USER); - User user = (User) getUserService().findById(User.class, userDto.getUserID()); - - // append the lams community auth info - learningDesignLocation = LamsCommunityUtil.appendAuthInfoToURL(learningDesignLocation, user); - - Integer workspaceFolderUid = null; - - File designFile = null; - String uploadPath = FileUtil.createTempDirectory("_uploaded_learningdesign") + File.separator - + FileUtil.getFileName(fileName); - - // get the ld input stream form the location - InputStream is = WebUtil.getResponseInputStreamFromExternalServer(learningDesignLocation, - new HashMap()); - - // Get the output stream to write the file for export - OutputStream out = new BufferedOutputStream(new FileOutputStream(uploadPath)); - - byte[] buffer = new byte[1024]; - int numRead; - long numWritten = 0; - while ((numRead = is.read(buffer)) != -1) { - out.write(buffer, 0, numRead); - numWritten += numRead; - } - log.debug("Path to ld import file: " + uploadPath); - - out.flush(); - out.close(); - is.close(); - - designFile = new File(uploadPath); - - if (designFile == null) { - MessageService msgService = getMessageService(); - log.error("Upload file missing. Filename was " + fileName); - String msg = msgService.getMessage(KEY_MSG_IMPORT_FILE_NOT_FOUND); - ldErrorMsgs.add(msg != null ? msg : "Upload file missing"); - - } else { - - IExportToolContentService service = getExportService(); - Object[] ldResults = service.importLearningDesign(designFile, user, workspaceFolderUid, toolsErrorMsgs, - customCSV); - ldId = (Long) ldResults[0]; - ldErrorMsgs = (List) ldResults[1]; - toolsErrorMsgs = (List) ldResults[2]; - } - } catch (Exception e) { - log.error("Error occured during import", e); - ldErrorMsgs.add(e.getClass().getName() + " " + e.getMessage()); - } - - request.setAttribute(ATTR_LD_ID, ldId); - if ((ldId == null || ldId.longValue() == -1) && ldErrorMsgs.size() == 0) { - MessageService msgService = getMessageService(); - ldErrorMsgs.add(msgService.getMessage(KEY_MSG_IMPORT_FAILED_UNKNOWN_REASON)); - } - if (ldErrorMsgs.size() > 0) { - request.setAttribute(ATTR_LD_ERROR_MESSAGE, ldErrorMsgs); - } - if (toolsErrorMsgs.size() > 0) { - request.setAttribute(ATTR_TOOLS_ERROR_MESSAGE, toolsErrorMsgs); - } - } - //*************************************************************************************** // Private method //*************************************************************************************** Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== diff -u -r169f966c6669b38b4180cab310ff7b8616ee1990 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 169f966c6669b38b4180cab310ff7b8616ee1990) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -356,20 +356,8 @@ public ActionForward logout(ActionMapping mapping, ActionForm form, HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException { - UserDTO userDTO = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); - if ((userDTO.getLoggedIntoLamsCommunity() != null) && userDTO.getLoggedIntoLamsCommunity()) { - HomeAction.log.debug("Need to log out user from lamscoomunity"); - req.getSession().invalidate(); - - // redirect to lamscommunity logout servlet to log out. - String url = "http://lamscommunity.org/register/logout?return_url="; - url += URLEncoder.encode(Configuration.get(ConfigurationKeys.SERVER_URL), "UTF8"); - res.sendRedirect(url); - return null; - } else { - req.getSession().invalidate(); - return mapping.findForward("index"); - } + req.getSession().invalidate(); + return mapping.findForward("index"); } private ActionForward displayMessage(ActionMapping mapping, HttpServletRequest req, String messageKey) { Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java =================================================================== diff -u -rb6c65c755217e6099fb5a3769a1ac049d9fcfaf3 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision b6c65c755217e6099fb5a3769a1ac049d9fcfaf3) +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -41,7 +41,6 @@ import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.config.Registration; import org.lamsfoundation.lams.index.IndexLinkBean; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.Role; @@ -117,11 +116,6 @@ } else if (StringUtils.equals(method, "lessons")) { return mapping.findForward("lessons"); } - - Registration reg = Configuration.getRegistration(); - if (reg != null) { - request.setAttribute("lamsCommunityEnabled", reg.isEnableLamsCommunityIntegration()); - } // only show the growl warning the first time after a user has logged in & if turned on in configuration Boolean tzWarning = Configuration.getAsBoolean(ConfigurationKeys.SHOW_TIMEZONE_WARNING); Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java =================================================================== diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java (.../ProfileAction.java) (revision c33d82bf97152099b7a309a156ec2707239b622c) +++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java (.../ProfileAction.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -215,9 +215,6 @@ request.setAttribute("sharedSecret", requestor.getTwoFactorAuthenticationSecret()); } - boolean hasLamsCommunityToken = requestor.getLamsCommunityToken() != null; - request.setAttribute("hasLamsCommunityToken", hasLamsCommunityToken); - themeService = getThemeService(); // Get all the css themes Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java =================================================================== diff -u -rfebc5ec394566f98439ce776a0be320b34310b0a -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java (.../ProfileSaveAction.java) (revision febc5ec394566f98439ce776a0be320b34310b0a) +++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java (.../ProfileSaveAction.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -133,12 +133,6 @@ Theme cssTheme = (Theme) getService().findById(Theme.class, (Long) userForm.get("userTheme")); requestor.setTheme(cssTheme); - - if ((userForm.get("disableLamsCommunityUsername") != null) - && (Boolean) userForm.get("disableLamsCommunityUsername")) { - requestor.setLamsCommunityToken(null); - requestor.setLamsCommunityUsername(null); - } } getService().saveUser(requestor); Fisheye: Tag 60e44b19b8de02a00faa437fba8117928baa3d73 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 60e44b19b8de02a00faa437fba8117928baa3d73 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 60e44b19b8de02a00faa437fba8117928baa3d73 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityUtil.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/WEB-INF/struts-config.xml =================================================================== diff -u -r4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_central/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7) +++ lams_central/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -18,10 +18,6 @@ type="org.lamsfoundation.lams.web.TextSearchActionForm" /> - @@ -43,11 +39,6 @@ type="org.lamsfoundation.lams.web.planner.PedagogicalPlannerSequenceNodeForm" /> - - @@ -69,9 +60,6 @@ - - - @@ -125,11 +113,6 @@ redirect="false" /> - - - - - - - - - - Index: lams_central/web/editprofile.jsp =================================================================== diff -u -r6ca906104290418a64ec1cf8ac28e14bbe2ed385 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_central/web/editprofile.jsp (.../editprofile.jsp) (revision 6ca906104290418a64ec1cf8ac28e14bbe2ed385) +++ lams_central/web/editprofile.jsp (.../editprofile.jsp) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -77,12 +77,6 @@ <%=AuthenticationMethod.DB%> - - - - - -
@@ -237,18 +231,6 @@ ${sharedSecret}
- - -
- - -
-
Index: lams_central/web/index.jsp =================================================================== diff -u -r797ce058f0a0a06bf182256999c0ef24cc3ea735 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_central/web/index.jsp (.../index.jsp) (revision 797ce058f0a0a06bf182256999c0ef24cc3ea735) +++ lams_central/web/index.jsp (.../index.jsp) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -28,9 +28,4 @@ - - - - - \ No newline at end of file + \ No newline at end of file Fisheye: Tag 60e44b19b8de02a00faa437fba8117928baa3d73 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/config/Registration.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml =================================================================== diff -u -r87602dac688db69886495061488ba4e4268d9f4e -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (.../User.hbm.xml) (revision 87602dac688db69886495061488ba4e4268d9f4e) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (.../User.hbm.xml) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -359,27 +359,6 @@ - - true - - @hibernate.property - column="lams_community_token" - length="255" - not-null="false" - - - - - true - - @hibernate.property - column="lams_community_username" - length="255" - not-null="false" - - Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -r2f02ea654f2380229d55ffd2483ba21ac48856d8 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 2f02ea654f2380229d55ffd2483ba21ac48856d8) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -430,7 +430,6 @@ - @@ -587,9 +586,6 @@ - - - Fisheye: Tag 60e44b19b8de02a00faa437fba8117928baa3d73 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/config/Registration.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 60e44b19b8de02a00faa437fba8117928baa3d73 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/config/dao/IRegistrationDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 60e44b19b8de02a00faa437fba8117928baa3d73 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/RegistrationDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040085.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040085.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040085.sql (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -0,0 +1,16 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4217 Remove LAMS Community integration +DROP TABLE IF EXISTS `lams_registration`; +ALTER TABLE `lams_user` DROP COLUMN `lams_community_username`, DROP COLUMN `lams_community_token`; +DELETE FROM `lams_configuration` WHERE `config_key`='LAMS_Community_enable'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java =================================================================== diff -u -r6ca906104290418a64ec1cf8ac28e14bbe2ed385 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 6ca906104290418a64ec1cf8ac28e14bbe2ed385) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -160,12 +160,6 @@ private Boolean changePassword; /** persistent field */ - private String lamsCommunityToken; - - /** persistent field */ - private String lamsCommunityUsername; - - /** persistent field */ private Boolean tutorialsDisabled; /** persistent field */ @@ -506,8 +500,7 @@ return new UserDTO(userId, firstName, lastName, login, languageIsoCode, countryIsoCode, direction, email, theme != null ? new ThemeDTO(theme) : null, // TimeZone.getTimeZone("Australia/Sydney"), - timeZone, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping, lamsCommunityToken, - lamsCommunityUsername, + timeZone, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping, (tutorialsDisabled == null ? false : true), // assume tutorials enabled if not set tutorialPages, (firstLogin == null ? true : false), // assume no firstLogin value means they haven't logged in @@ -596,22 +589,6 @@ this.changePassword = changePassword; } - public String getLamsCommunityToken() { - return lamsCommunityToken; - } - - public void setLamsCommunityToken(String lamsCommunityToken) { - this.lamsCommunityToken = lamsCommunityToken; - } - - public String getLamsCommunityUsername() { - return lamsCommunityUsername; - } - - public void setLamsCommunityUsername(String lamsCommunityUsername) { - this.lamsCommunityUsername = lamsCommunityUsername; - } - public String getTimeZone() { if (timeZone == null) { timeZone = TimeZone.getDefault().getID(); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java (.../IRoleDAO.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java (.../IRoleDAO.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -33,7 +33,5 @@ public interface IRoleDAO extends IBaseDAO { User getUserByOrganisationAndRole(Integer userId, Integer roleId, Organisation organisation); - Integer getCountRoleForSystem(final Integer roleId); - Integer getCountRoleForOrg(Integer roleId, Integer orgId, String searchPhrase); } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java (.../RoleDAO.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java (.../RoleDAO.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -44,10 +44,6 @@ + "u.id = uo.user.id and " + "uo.organisation = :org and " + "uor.userOrganisation.id = uo.id and " + "uor.role.id = :roleId"; - private final static String COUNT_ROLE = "select count(distinct userOrganisationRole.userOrganisation.user)" - + " from " + UserOrganisationRole.class.getName() + " userOrganisationRole" - + " where userOrganisationRole.role.roleId = :roleId"; - private final static String COUNT_ROLE_FOR_ORG = "select count(distinct uor.userOrganisation.user) from " + UserOrganisationRole.class.getName() + " uor where uor.role.roleId = :roleId" + " and uor.userOrganisation.organisation.organisationId = :orgId"; @@ -59,15 +55,6 @@ } @Override - public Integer getCountRoleForSystem(Integer roleId) { - - Query query = getSession().createQuery(RoleDAO.COUNT_ROLE); - query.setInteger("roleId", roleId.intValue()); - Object value = query.uniqueResult(); - return new Integer(((Number) value).intValue()); - } - - @Override public Integer getCountRoleForOrg(Integer roleId, Integer orgId, String searchPhrase) { StringBuilder queryTextBuilder = new StringBuilder(RoleDAO.COUNT_ROLE_FOR_ORG); if (!StringUtils.isBlank(searchPhrase)) { Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java =================================================================== diff -u -rff448aacbef534e7fb4b5a76fe497eee0e9439da -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java (.../UserDAO.java) (revision ff448aacbef534e7fb4b5a76fe497eee0e9439da) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java (.../UserDAO.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -60,7 +60,7 @@ String email = (String) element[4]; UserDTO userDto = new UserDTO(userId, firstName, lastName, login, null, null, null, email, null, null, null, - null, null, null, true, null, false, null); + null, true, null, false, null); userDtos.add(userDto); } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java =================================================================== diff -u -r353fe07604639c2166ed68fbf832810959f3f3cf -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java (.../UserDTO.java) (revision 353fe07604639c2166ed68fbf832810959f3f3cf) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java (.../UserDTO.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -49,19 +49,15 @@ private ThemeDTO theme; private TimeZone timeZone; private Integer authenticationMethodId; - private String lamsCommunityToken; - private String lamsCommunityUsername; - private Boolean loggedIntoLamsCommunity; private Boolean tutorialsDisabled; private Set pagesWithDisabledTutorials; private Boolean firstLogin; private Integer lastVisitedOrganisationId; public UserDTO(Integer userID, String firstName, String lastName, String login, String localeLanguage, String localeCountry, String direction, String email, ThemeDTO htmlTheme, TimeZone timezone, - Integer authenticationMethodId, String fckLanguageMapping, String lamsCommunityToken, - String lamsCommunityUsername, Boolean tutorialsDisabled, Set pagesWithDisabledTutorials, - Boolean firstLogin, Integer lastVisitedOrganisationId) { + Integer authenticationMethodId, String fckLanguageMapping, Boolean tutorialsDisabled, + Set pagesWithDisabledTutorials, Boolean firstLogin, Integer lastVisitedOrganisationId) { this.userID = userID; this.firstName = firstName; this.lastName = lastName; @@ -74,8 +70,6 @@ timeZone = timezone; this.authenticationMethodId = authenticationMethodId; this.fckLanguageMapping = fckLanguageMapping; - this.lamsCommunityToken = lamsCommunityToken; - this.lamsCommunityUsername = lamsCommunityUsername; this.tutorialsDisabled = tutorialsDisabled; this.pagesWithDisabledTutorials = pagesWithDisabledTutorials; this.firstLogin = firstLogin; @@ -174,40 +168,13 @@ .append("direction", getDirection()).append("email", getEmail()).append("htmlTheme", getTheme()) .append("timeZone", getTimeZone()).append("authenticationMethodId", getAuthenticationMethodId()) .append("fckLanguageMapping", getFckLanguageMapping()) - .append("lamsCommunityUser", this.getLamsCommunityUsername()) - .append("lamsCommunityToken", this.getLamsCommunityToken()) - .append("loggedIntoLamsCommunity", "" + this.getLoggedIntoLamsCommunity()) .append("tutorialsDisabled", "" + getTutorialsDisabled()).toString(); } public String getFckLanguageMapping() { return fckLanguageMapping; } - public String getLamsCommunityToken() { - return lamsCommunityToken; - } - - public void setLamsCommunityToken(String lamsCommunityToken) { - this.lamsCommunityToken = lamsCommunityToken; - } - - public String getLamsCommunityUsername() { - return lamsCommunityUsername; - } - - public void setLamsCommunityUsername(String lamsCommunityUsername) { - this.lamsCommunityUsername = lamsCommunityUsername; - } - - public Boolean getLoggedIntoLamsCommunity() { - return loggedIntoLamsCommunity; - } - - public void setLoggedIntoLamsCommunity(Boolean loggedIntoLamsCommunity) { - this.loggedIntoLamsCommunity = loggedIntoLamsCommunity; - } - public Boolean getTutorialsDisabled() { return tutorialsDisabled; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== diff -u -rfebc5ec394566f98439ce776a0be320b34310b0a -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision febc5ec394566f98439ce776a0be320b34310b0a) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -356,14 +356,6 @@ boolean isUserSysAdmin(); /** - * Count the number of unique (distinct) users with a particular role in the system. - * - * @param roleId - * Role ID - */ - Integer getCountRoleForSystem(Integer roleId); - - /** * Count then umber of users with a particular role in a given org. * * @param orgId Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -rb0c5fcd46a3576f65151b6a504eb9479bb3764ef -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision b0c5fcd46a3576f65151b6a504eb9479bb3764ef) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -837,16 +837,6 @@ } @Override - public Integer getCountRoleForSystem(Integer roleId) { - Integer count = roleDAO.getCountRoleForSystem(roleId); - if (count != null) { - return count; - } else { - return new Integer(0); - } - } - - @Override public Integer getCountRoleForOrg(Integer orgId, Integer roleId, String searchPhrase) { Integer count = roleDAO.getCountRoleForOrg(roleId, orgId, searchPhrase); if (count != null) { Index: lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java =================================================================== diff -u -r8144836a25cc24b373dff4a6873a5c1b3b46ea39 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java (.../Configuration.java) (revision 8144836a25cc24b373dff4a6873a5c1b3b46ea39) +++ lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java (.../Configuration.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -40,9 +40,7 @@ import org.jboss.as.controller.client.helpers.Operations; import org.jboss.dmr.ModelNode; import org.lamsfoundation.lams.config.ConfigurationItem; -import org.lamsfoundation.lams.config.Registration; import org.lamsfoundation.lams.config.dao.IConfigurationDAO; -import org.lamsfoundation.lams.config.dao.IRegistrationDAO; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; import org.quartz.JobBuilder; import org.quartz.JobDetail; @@ -74,7 +72,6 @@ private static Map items = null; protected static IConfigurationDAO configurationDAO; - protected static IRegistrationDAO registrationDAO; protected static MessageService messageService; protected static Scheduler scheduler; @@ -118,10 +115,6 @@ return null; } - public static Registration getRegistration() { - return Configuration.registrationDAO.get(); - } - public static void refreshCache() { Map itemMap = Collections .synchronizedMap(new LinkedHashMap()); @@ -188,10 +181,6 @@ } } - public static void saveOrUpdateRegistration(Registration reg) { - Configuration.registrationDAO.saveOrUpdate(reg); - } - public static void setItemValue(Object obj, String value) { ConfigurationItem item = (ConfigurationItem) obj; item.setValue(value); @@ -315,10 +304,6 @@ return Configuration.messageService; } - public IRegistrationDAO getRegistrationDAO() { - return Configuration.registrationDAO; - } - public void persistUpdate() { updatePublicFolderName(); Configuration.configurationDAO.insertOrUpdateAll(Configuration.items.values()); @@ -336,10 +321,6 @@ Configuration.messageService = messageService; } - public void setRegistrationDAO(IRegistrationDAO registrationDAO) { - Configuration.registrationDAO = registrationDAO; - } - public void setScheduler(Scheduler scheduler) { Configuration.scheduler = scheduler; } Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== diff -u -rb6c65c755217e6099fb5a3769a1ac049d9fcfaf3 -r60e44b19b8de02a00faa437fba8117928baa3d73 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision b6c65c755217e6099fb5a3769a1ac049d9fcfaf3) +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) @@ -116,8 +116,6 @@ public static String ALLOW_DIRECT_LESSON_LAUNCH = "AllowDirectLessonLaunch"; - public static String LAMS_COMMUNITY_ENABLE = "LAMS_Community_enable"; - public static String ALLOW_EDIT_ON_FLY = "AllowLiveEdit"; public static String SHOW_ALL_MY_LESSON_LINK = "ShowAllMyLessonLink";