Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java =================================================================== diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java (.../CleanupPreviewLessonsController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java (.../CleanupPreviewLessonsController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -46,44 +46,40 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; /** * @author Marcin Cieslak */ @Controller @RequestMapping("/cleanupPreviewLessons") public class CleanupPreviewLessonsController { - private static Logger log = Logger.getLogger(CleanupPreviewLessonsController.class); - private static IMonitoringService monitoringService; - private static ILessonService lessonService; - private static ISecurityService securityService; - @Autowired + private IMonitoringService monitoringService; + @Autowired + private ILessonService lessonService; + @Autowired + private ISecurityService securityService; + @Autowired @Qualifier("adminMessageService") - private MessageService adminMessageService; + private MessageService messageService; - @Autowired - private WebApplicationContext applicationContext; - @RequestMapping(path = "/start") public String unspecified(HttpServletRequest request, HttpServletResponse response) throws IOException { - if (!getSecurityService().isSysadmin(getUserID(), "display cleanup preview lessons", false)) { + if (!securityService.isSysadmin(getUserID(), "display cleanup preview lessons", false)) { response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a sysadmin"); return null; } if (!(request.isUserInRole(Role.SYSADMIN))) { request.setAttribute("errorName", "CleanupPreviewLessonsController"); - request.setAttribute("errorMessage", adminMessageService.getMessage("error.need.sysadmin")); + request.setAttribute("errorMessage", messageService.getMessage("error.need.sysadmin")); return "error"; } - long[] lessonCount = getLessonService().getPreviewLessonCount(); + long[] lessonCount = lessonService.getPreviewLessonCount(); request.setAttribute("previewCount", lessonCount[0]); request.setAttribute("allLessonCount", lessonCount[1]); @@ -95,14 +91,14 @@ public String deletePreviewLessons(HttpServletRequest request, HttpServletResponse response) throws IOException { Integer userID = getUserID(); Integer limit = WebUtil.readIntParam(request, "limit", true); - List lessonIDs = getLessonService().getPreviewLessons(limit); + List lessonIDs = lessonService.getPreviewLessons(limit); for (Long lessonID : lessonIDs) { log.info("Deleting preview lesson: " + lessonID); // role is checked in this method - getMonitoringService().removeLessonPermanently(lessonID, userID); + monitoringService.removeLessonPermanently(lessonID, userID); } - long[] lessonCount = getLessonService().getPreviewLessonCount(); + long[] lessonCount = lessonService.getPreviewLessonCount(); String responseJSON = JsonUtil.toString(lessonCount); response.setContentType("application/json;charset=utf-8"); response.getWriter().print(responseJSON); @@ -114,31 +110,4 @@ UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); return user == null ? null : user.getUserID(); } - - private IMonitoringService getMonitoringService() { - if (monitoringService == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - monitoringService = (IMonitoringService) ctx.getBean("monitoringService"); - } - return monitoringService; - } - - private ILessonService getLessonService() { - if (lessonService == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - lessonService = (ILessonService) ctx.getBean("lessonService"); - } - return lessonService; - } - - private ISecurityService getSecurityService() { - if (securityService == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - securityService = (ISecurityService) ctx.getBean("securityService"); - } - return securityService; - } } \ No newline at end of file Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java =================================================================== diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java (.../CleanupTempFilesController.java) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java (.../CleanupTempFilesController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -44,32 +44,23 @@ /** * @author jliew - * - * - * - * - * - * - * - * */ @Controller @RequestMapping("/cleanup") public class CleanupTempFilesController { - private static Logger log = Logger.getLogger(CleanupTempFilesController.class); @Autowired @Qualifier("adminMessageService") - private MessageService adminMessageService; + private MessageService messageService; @RequestMapping(path = "/start") public String execute(@ModelAttribute CleanupForm cleanupForm, HttpServletRequest request) throws Exception { // check user is sysadmin if (!(request.isUserInRole(Role.SYSADMIN))) { request.setAttribute("errorName", "CleanupTempFilesAction"); - request.setAttribute("errorMessage", adminMessageService.getMessage("error.need.sysadmin")); + request.setAttribute("errorMessage", messageService.getMessage("error.need.sysadmin")); return "error"; } @@ -88,9 +79,9 @@ int filesDeleted = FileUtil.cleanupOldFiles(FileUtil.getOldTempFiles(numDays)); String args[] = new String[1]; args[0] = new Integer(filesDeleted).toString(); - request.setAttribute("filesDeleted", adminMessageService.getMessage("msg.cleanup.files.deleted", args)); + request.setAttribute("filesDeleted", messageService.getMessage("msg.cleanup.files.deleted", args)); } else { - errorMap.add("numDays", adminMessageService.getMessage("error.non.negative.number.required")); + errorMap.add("numDays", messageService.getMessage("error.non.negative.number.required")); } } else { // recommended number of days to leave temp files Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java (.../CloneLessonsController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java (.../CloneLessonsController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -32,7 +32,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.monitoring.service.IMonitoringService; @@ -49,22 +48,21 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.WebApplicationContext; /** * @author jliew */ @Controller @RequestMapping("/clone") public class CloneLessonsController { - private static final Logger log = Logger.getLogger(CloneLessonsController.class); - private static IUserManagementService userManagementService; - private static ILessonService lessonService; - private static IMonitoringService monitoringService; @Autowired - private WebApplicationContext applicationContext; + private IUserManagementService userManagementService; + @Autowired + private ILessonService lessonService; + @Autowired + private IMonitoringService monitoringService; @RequestMapping(path = "/start") public String execute(HttpServletRequest request, HttpServletResponse response) throws UserAccessDeniedException { @@ -75,9 +73,6 @@ List errors = new ArrayList<>(); try { - CloneLessonsController.userManagementService = AdminServiceProxy - .getService(applicationContext.getServletContext()); - String method = WebUtil.readStrParam(request, "method", true); if (StringUtils.equals(method, "getGroups")) { return getGroups(response); @@ -100,7 +95,7 @@ // default action Integer groupId = WebUtil.readIntParam(request, "groupId", false); - request.setAttribute("org", CloneLessonsController.userManagementService.findById(Organisation.class, groupId)); + request.setAttribute("org", userManagementService.findById(Organisation.class, groupId)); return "organisation/cloneStart"; } @@ -113,8 +108,8 @@ response.addHeader("Cache-Control", "no-cache"); response.addHeader("content-type", "text/html; charset=UTF-8"); - List groups = CloneLessonsController.userManagementService - .getOrganisationsByTypeAndStatus(OrganisationType.COURSE_TYPE, OrganisationState.ACTIVE); + List groups = userManagementService.getOrganisationsByTypeAndStatus(OrganisationType.COURSE_TYPE, + OrganisationState.ACTIVE); for (Object o : groups) { Organisation org = (Organisation) o; response.getWriter() @@ -141,7 +136,7 @@ properties.put("organisationState.organisationStateId", OrganisationState.ACTIVE); response.getWriter().println(""); - List groups = CloneLessonsController.userManagementService.findByProperties(Organisation.class, properties); + List groups = userManagementService.findByProperties(Organisation.class, properties); for (Object o : groups) { Organisation org = (Organisation) o; response.getWriter() @@ -159,10 +154,7 @@ Integer sourceGroupId = WebUtil.readIntParam(request, "sourceGroupId", true); if (sourceGroupId != null) { - CloneLessonsController.lessonService = AdminServiceProxy - .getLessonService(applicationContext.getServletContext()); - - List lessons = CloneLessonsController.lessonService.getLessonsByGroup(sourceGroupId); + List lessons = lessonService.getLessonsByGroup(sourceGroupId); request.setAttribute("lessons", lessons); } @@ -176,8 +168,7 @@ Integer groupId = WebUtil.readIntParam(request, "groupId", false); - Vector monitors = CloneLessonsController.userManagementService.getUsersFromOrganisationByRole(groupId, - Role.MONITOR, true); + Vector monitors = userManagementService.getUsersFromOrganisationByRole(groupId, Role.MONITOR, true); request.setAttribute("monitors", monitors); response.addHeader("Cache-Control", "no-cache"); @@ -190,8 +181,7 @@ Integer groupId = WebUtil.readIntParam(request, "groupId", false); - Vector learners = CloneLessonsController.userManagementService.getUsersFromOrganisationByRole(groupId, - Role.LEARNER, true); + Vector learners = userManagementService.getUsersFromOrganisationByRole(groupId, Role.LEARNER, true); request.setAttribute("learners", learners); response.addHeader("Cache-Control", "no-cache"); @@ -219,15 +209,11 @@ learnerIds = learners.split(","); } - CloneLessonsController.monitoringService = AdminServiceProxy - .getMonitoringService(applicationContext.getServletContext()); int result = 0; - - Organisation group = (Organisation) CloneLessonsController.userManagementService.findById(Organisation.class, - groupId); + Organisation group = (Organisation) userManagementService.findById(Organisation.class, groupId); if (group != null) { - result = CloneLessonsController.monitoringService.cloneLessons(lessonIds, addAllStaff, addAllLearners, - staffIds, learnerIds, group); + result = monitoringService.cloneLessons(lessonIds, addAllStaff, addAllLearners, staffIds, learnerIds, + group); } else { throw new UserException("Couldn't find Organisation based on id=" + groupId); } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java (.../ConfigController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java (.../ConfigController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang.StringUtils; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.ConfigForm; import org.lamsfoundation.lams.config.ConfigurationItem; import org.lamsfoundation.lams.util.Configuration; @@ -40,43 +39,25 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * ConfigAction * * @author Mitchell Seaton */ -/** - * - * - * - * - * - */ @Controller public class ConfigController { - - private static Configuration configurationService; - + @Autowired - private WebApplicationContext applicationContext; - + private Configuration configurationService; @Autowired @Qualifier("adminMessageService") - private MessageService adminMessageService; + private MessageService messageService; - private Configuration getConfiguration() { - if (configurationService == null) { - configurationService = AdminServiceProxy.getConfiguration(applicationContext.getServletContext()); - } - return configurationService; - } - @RequestMapping(path = "/config") public String unspecified(@ModelAttribute ConfigForm configForm, HttpServletRequest request) throws Exception { - request.setAttribute("config", getConfiguration().arrangeItems(Configuration.ITEMS_NON_LDAP)); + request.setAttribute("config", configurationService.arrangeItems(Configuration.ITEMS_NON_LDAP)); request.setAttribute("countryCodes", LanguageUtil.getCountryCodes(false)); Map smtpAuthTypes = new LinkedHashMap(); smtpAuthTypes.put("none", "None"); @@ -96,7 +77,7 @@ String errorForward = "config/editconfig"; for (int i = 0; i < keys.length; i++) { - ConfigurationItem item = getConfiguration().getConfigItemByKey(keys[i]); + ConfigurationItem item = configurationService.getConfigItemByKey(keys[i]); if (item != null) { // return to ldap page if that's where we came from @@ -107,7 +88,7 @@ if (item.getRequired()) { if (!(values[i] != null && values[i].length() > 0)) { request.setAttribute("error", getRequiredError(item.getDescriptionKey())); - request.setAttribute("config", getConfiguration().arrangeItems(Configuration.ITEMS_NON_LDAP)); + request.setAttribute("config", configurationService.arrangeItems(Configuration.ITEMS_NON_LDAP)); return errorForward; } } @@ -117,14 +98,14 @@ Long.parseLong(values[i]); } catch (NumberFormatException e) { request.setAttribute("error", getNumericError(item.getDescriptionKey())); - request.setAttribute("config", getConfiguration().arrangeItems(Configuration.ITEMS_NON_LDAP)); + request.setAttribute("config", configurationService.arrangeItems(Configuration.ITEMS_NON_LDAP)); return errorForward; } } Configuration.updateItem(keys[i], values[i]); } } - getConfiguration().persistUpdate(); + configurationService.persistUpdate(); Configuration.refreshCache(); @@ -133,14 +114,14 @@ private String getRequiredError(String arg) { String[] args = new String[1]; - args[0] = adminMessageService.getMessage(arg); - return adminMessageService.getMessage("error.required", args); + args[0] = messageService.getMessage(arg); + return messageService.getMessage("error.required", args); } private String getNumericError(String arg) { String[] args = new String[1]; - args[0] = adminMessageService.getMessage(arg); - return adminMessageService.getMessage("error.numeric", args); + args[0] = messageService.getMessage(arg); + return messageService.getMessage("error.numeric", args); } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/DisabledUserManageController.java =================================================================== diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/DisabledUserManageController.java (.../DisabledUserManageController.java) (revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/DisabledUserManageController.java (.../DisabledUserManageController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -28,48 +28,35 @@ import javax.servlet.http.HttpServletRequest; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; /** * @author jliew - * - * - * - * */ @Controller public class DisabledUserManageController { - private static final Logger log = Logger.getLogger(DisabledUserManageController.class); @Autowired - private WebApplicationContext applicationContext; - + private IUserManagementService userManagementService; @Autowired - @Qualifier("adminMessageService") private MessageService adminMessageService; @RequestMapping("/disabledmanage") public String execute(HttpServletRequest request) throws Exception { - - IUserManagementService service = AdminServiceProxy.getService(applicationContext.getServletContext()); - - if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) { + if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupAdmin())) { request.setAttribute("errorName", "DisabledUserManageAction"); request.setAttribute("errorMessage", adminMessageService.getMessage("error.need.sysadmin")); return "error"; } - List users = service.findByProperty(User.class, "disabledFlag", true); + List users = userManagementService.findByProperty(User.class, "disabledFlag", true); log.debug("got " + users.size() + " disabled users"); request.setAttribute("users", users); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java =================================================================== diff -u -r8d8232ae7142c30068360a2a41bbcccc065e775b -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java (.../ImportExcelSaveController.java) (revision 8d8232ae7142c30068360a2a41bbcccc065e775b) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java (.../ImportExcelSaveController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -36,34 +36,24 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; import org.springframework.web.multipart.MultipartFile; /** * @author jliew - * - * - * - * - * - * - * - * - * - * - * - * */ @Controller public class ImportExcelSaveController { @Autowired + private IImportService importService; + + @Autowired private WebApplicationContext applicationContext; @RequestMapping(path = "/importexcelsave", method = RequestMethod.POST) public String execute(@ModelAttribute ImportExcelForm importExcelForm, HttpServletRequest request) throws Exception { - - IImportService importService = AdminServiceProxy.getImportService(applicationContext.getServletContext()); MultipartFile file = importExcelForm.getFile(); // validation @@ -74,15 +64,15 @@ String sessionId = SessionManager.getSession().getId(); SessionManager.getSession().setAttribute(IImportService.IMPORT_FILE, file); // use a new thread only if number of users is > threshold - if (importService.getNumRows(file) < IImportService.THRESHOLD) { - List results = importService.parseSpreadsheet(file, sessionId); - SessionManager.getSession(sessionId).setAttribute(IImportService.IMPORT_RESULTS, results); - return "forward:/importuserresult.do"; - } else { +// if (importService.getNumRows(file) < IImportService.THRESHOLD) { +// List results = importService.parseSpreadsheet(file, sessionId); +// SessionManager.getSession(sessionId).setAttribute(IImportService.IMPORT_RESULTS, results); +// return "forward:/importuserresult.do"; +// } else { Thread t = new Thread(new ImportExcelThread(sessionId)); t.start(); return "import/status"; - } +// } } private class ImportExcelThread implements Runnable { @@ -94,7 +84,9 @@ @Override public void run() { - IImportService importService = AdminServiceProxy.getImportService(applicationContext.getServletContext()); + WebApplicationContext wac = WebApplicationContextUtils + .getRequiredWebApplicationContext(applicationContext.getServletContext()); + IImportService importService = (IImportService) wac.getBean("importService"); try { MultipartFile file = (MultipartFile) SessionManager.getSession(sessionId) .getAttribute(IImportService.IMPORT_FILE); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java =================================================================== diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java (.../ImportGroupsController.java) (revision 9d51ed040508d8d5a10ee4033aded0c3784490a8) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java (.../ImportGroupsController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -26,40 +26,27 @@ import javax.servlet.http.HttpServletRequest; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.service.IImportService; import org.lamsfoundation.lams.admin.web.form.ImportExcelForm; import org.lamsfoundation.lams.web.session.SessionManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; import org.springframework.web.multipart.MultipartFile; /** * @author jliew - * - * - * - * - * - * - * - * - * */ @Controller public class ImportGroupsController { @Autowired - private WebApplicationContext applicationContext; + private IImportService importService; @RequestMapping(path = "/importgroups") - public String execute(@ModelAttribute("importForm") ImportExcelForm importForm, HttpServletRequest request) throws Exception { - - IImportService importService = AdminServiceProxy.getImportService(applicationContext.getServletContext()); + public String execute(@ModelAttribute("importForm") ImportExcelForm importForm, HttpServletRequest request) + throws Exception { importForm.setOrgId(0); MultipartFile file = importForm.getFile(); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java (.../ImportUserResultController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java (.../ImportUserResultController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -29,36 +29,30 @@ import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.service.IImportService; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.web.session.SessionManager; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; import org.springframework.web.multipart.MultipartFile; /** * @author jliew - * - * - * */ @Controller public class ImportUserResultController { - private static Logger log = Logger.getLogger(ImportUserResultController.class); @Autowired - private WebApplicationContext applicationContext; + private IImportService importService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping(path = "/importuserresult") public String execute(HttpServletRequest request) throws Exception { - - MessageService messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - IImportService importService = AdminServiceProxy.getImportService(applicationContext.getServletContext()); HttpSession ss = SessionManager.getSession(); List results = (List) ss.getAttribute(IImportService.IMPORT_RESULTS); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java =================================================================== diff -u -r472fb979e3afdb43a7d537e588c5204554ba9f38 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java (.../LdapConfigController.java) (revision 472fb979e3afdb43a7d537e588c5204554ba9f38) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java (.../LdapConfigController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -29,7 +29,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.ConfigForm; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; import org.lamsfoundation.lams.usermanagement.dto.BulkUpdateResultDTO; @@ -41,61 +40,29 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * @author jliew - * - * - * - * - * */ @Controller @RequestMapping("/ldap") public class LdapConfigController { - private static Logger log = Logger.getLogger(LdapConfigController.class); - private static IUserManagementService service; - private static LdapService ldapService; - private static MessageService messageService; - private static Configuration configurationService; - + @Autowired - private WebApplicationContext applicationContext; + private Configuration configurationService; + @Autowired + private LdapService ldapService; + @Autowired + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; - private IUserManagementService getService() { - if (service == null) { - service = AdminServiceProxy.getService(applicationContext.getServletContext()); - } - return service; - } - - private LdapService getLdapService() { - if (ldapService == null) { - ldapService = AdminServiceProxy.getLdapService(applicationContext.getServletContext()); - } - return ldapService; - } - - private MessageService getMessageService() { - if (messageService == null) { - messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - } - return messageService; - } - - private Configuration getConfiguration() { - if (configurationService == null) { - configurationService = AdminServiceProxy.getConfiguration(applicationContext.getServletContext()); - } - return configurationService; - } - @RequestMapping(path = "/start") public String execute(@ModelAttribute ConfigForm configForm, HttpServletRequest request) throws Exception { @@ -112,7 +79,7 @@ } } - request.setAttribute("config", getConfiguration().arrangeItems(Configuration.ITEMS_ONLY_LDAP)); + request.setAttribute("config", configurationService.arrangeItems(Configuration.ITEMS_ONLY_LDAP)); int numLdapUsers = getNumLdapUsers(); request.setAttribute("numLdapUsersMsg", getNumLdapUsersMsg(numLdapUsers)); @@ -127,15 +94,15 @@ Thread t = new Thread(new LdapSyncThread(sessionId)); t.start(); - request.setAttribute("wait", getMessageService().getMessage("msg.ldap.synchronise.wait")); + request.setAttribute("wait", messageService.getMessage("msg.ldap.synchronise.wait")); return "ldap"; } @RequestMapping(path = "/waiting") public String waiting(HttpServletRequest request) throws Exception { - request.setAttribute("wait", getMessageService().getMessage("msg.ldap.synchronise.wait")); + request.setAttribute("wait", messageService.getMessage("msg.ldap.synchronise.wait")); return "ldap"; } @@ -157,12 +124,12 @@ request.setAttribute("numLdapUsersUpdated", getNumUpdatedUsersMsg(dto.getNumUsersUpdated())); request.setAttribute("numLdapUsersDisabled", getNumDisabledUsersMsg(dto.getNumUsersDisabled())); request.setAttribute("messages", dto.getMessages()); - request.setAttribute("done", getMessageService().getMessage("msg.done")); + request.setAttribute("done", messageService.getMessage("msg.done")); } else { ArrayList list = new ArrayList<>(); list.add((String) o); request.setAttribute("messages", list); - request.setAttribute("done", getMessageService().getMessage("msg.done")); + request.setAttribute("done", messageService.getMessage("msg.done")); } // remove session variable that flags bulk update as done @@ -172,38 +139,38 @@ } private int getNumLdapUsers() { - Integer count = getService().getCountUsers(AuthenticationMethod.LDAP); + Integer count = userManagementService.getCountUsers(AuthenticationMethod.LDAP); return (count != null ? count.intValue() : -1); } private String getNumLdapUsersMsg(int numLdapUsers) { String[] args = new String[1]; args[0] = String.valueOf(numLdapUsers); - return getMessageService().getMessage("msg.num.ldap.users", args); + return messageService.getMessage("msg.num.ldap.users", args); } private String getNumSearchResultsUsersMsg(int searchResults) { String[] args = new String[1]; args[0] = String.valueOf(searchResults); - return getMessageService().getMessage("msg.num.search.results.users", args); + return messageService.getMessage("msg.num.search.results.users", args); } private String getNumCreatedUsersMsg(int created) { String[] args = new String[1]; args[0] = String.valueOf(created); - return getMessageService().getMessage("msg.num.created.users", args); + return messageService.getMessage("msg.num.created.users", args); } private String getNumUpdatedUsersMsg(int updated) { String[] args = new String[1]; args[0] = String.valueOf(updated); - return getMessageService().getMessage("msg.num.updated.users", args); + return messageService.getMessage("msg.num.updated.users", args); } private String getNumDisabledUsersMsg(int disabled) { String[] args = new String[1]; args[0] = String.valueOf(disabled); - return getMessageService().getMessage("msg.num.disabled.users", args); + return messageService.getMessage("msg.num.disabled.users", args); } private class LdapSyncThread implements Runnable { @@ -220,7 +187,7 @@ this.log.info("=== Beginning LDAP user sync ==="); long start = System.currentTimeMillis(); try { - BulkUpdateResultDTO dto = getLdapService().bulkUpdate(); + BulkUpdateResultDTO dto = ldapService.bulkUpdate(); long end = System.currentTimeMillis(); this.log.info("=== Finished LDAP user sync ==="); this.log.info("Bulk update took " + (end - start) / 1000 + " seconds."); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java (.../LogEventController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java (.../LogEventController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.logevent.LogEvent; import org.lamsfoundation.lams.logevent.LogEventType; import org.lamsfoundation.lams.logevent.dto.LogEventTypeDTO; @@ -43,12 +42,10 @@ import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; @@ -60,31 +57,25 @@ @Controller @RequestMapping("/logevent") public class LogEventController { - - private static ILogEventService logEventService; - private MessageService messageService; private static SimpleDateFormat START_DATE_FORMAT = new SimpleDateFormat("YYYY-MM-dd"); @Autowired - private WebApplicationContext applicationContext; + private ILogEventService logEventService; + + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping(path = "/start") public String unspecified(HttpServletRequest request) throws Exception { // check permission if (!request.isUserInRole(Role.SYSADMIN)) { request.setAttribute("errorName", "EventLogAdmin"); - request.setAttribute("errorMessage", AdminServiceProxy - .getMessageService(applicationContext.getServletContext()).getMessage("error.authorisation")); + request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } - logEventService = getLogEventService(); - - if (messageService == null) { - messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - } - // get the log type data and return display for user selection. Also get the start and stop dates from the log. // TODO check conversion the dates to the user's timezone List types = logEventService.getEventTypes(); @@ -113,13 +104,10 @@ // check permission if (!request.isUserInRole(Role.SYSADMIN)) { request.setAttribute("errorName", "EventLogAdmin"); - request.setAttribute("errorMessage", AdminServiceProxy - .getMessageService(applicationContext.getServletContext()).getMessage("error.authorisation")); + request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } - logEventService = getLogEventService(); - // paging parameters of tablesorter int size = WebUtil.readIntParam(request, "size"); int page = WebUtil.readIntParam(request, "page"); @@ -200,13 +188,4 @@ return responsedata.toString(); } - private ILogEventService getLogEventService() throws ServletException { - if (logEventService == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - logEventService = (ILogEventService) ctx.getBean("logEventService"); - } - return logEventService; - } - } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java =================================================================== diff -u -r7525e7b5fda723cc9c2c81a78cd8be3785bad851 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java (.../LtiConsumerManagementController.java) (revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java (.../LtiConsumerManagementController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -9,56 +9,42 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.LtiConsumerForm; import org.lamsfoundation.lams.integration.ExtServer; import org.lamsfoundation.lams.integration.service.IIntegrationService; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * @author Andrey Balan */ @Controller @RequestMapping("/ltiConsumerManagement") public class LtiConsumerManagementController { - private static Logger log = Logger.getLogger(LtiConsumerManagementController.class); + + @Autowired + private IIntegrationService integrationService; + @Autowired private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") private MessageService messageService; - private IIntegrationService integrationService; - @Autowired - private WebApplicationContext applicationContext; - - private void initServices() { - if (userManagementService == null) { - userManagementService = AdminServiceProxy.getService(applicationContext.getServletContext()); - } - if (messageService == null) { - messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - } - if (integrationService == null) { - integrationService = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext()); - } - } - /** * Shows all available LTI tool consumers */ @RequestMapping(path = "/start") public String unspecified(HttpServletRequest request) { - initServices(); - List ltiConsumers = integrationService.getAllToolConsumers(); Collections.sort(ltiConsumers); request.setAttribute("ltiConsumers", ltiConsumers); @@ -71,9 +57,6 @@ */ @RequestMapping(path = "/edit") public String edit(@ModelAttribute LtiConsumerForm ltiConsumerForm, HttpServletRequest request) throws Exception { - - initServices(); - Integer sid = WebUtil.readIntParam(request, "sid", true); // editing a tool consumer @@ -96,9 +79,6 @@ */ @RequestMapping(path = "/disable") public String disable(HttpServletRequest request) throws Exception { - - initServices(); - Integer sid = WebUtil.readIntParam(request, "sid", true); boolean disable = WebUtil.readBooleanParam(request, "disable"); ExtServer ltiConsumer = integrationService.getExtServer(sid); @@ -113,9 +93,6 @@ */ @RequestMapping(path = "/delete") public String delete(HttpServletRequest request) throws Exception { - - initServices(); - Integer sid = WebUtil.readIntParam(request, "sid", true); userManagementService.deleteById(ExtServer.class, sid); @@ -128,9 +105,6 @@ @RequestMapping(path = "/save", method = RequestMethod.POST) public String save(@ModelAttribute LtiConsumerForm ltiConsumerForm, HttpServletRequest request, HttpServletResponse response) throws Exception { - - initServices(); - MultiValueMap errorMap = new LinkedMultiValueMap<>(); if (StringUtils.trimToNull(ltiConsumerForm.getServerid()) == null) { Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java =================================================================== diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java (.../OrgManageController.java) (revision c9e22b65129fe7561d7e66f5d6338557b0f3236a) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java (.../OrgManageController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.OrgManageForm; import org.lamsfoundation.lams.security.ISecurityService; import org.lamsfoundation.lams.usermanagement.Organisation; @@ -38,46 +37,40 @@ import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.usermanagement.service.UserManagementService; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; import org.springframework.web.util.HtmlUtils; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; /** - *

- * View Source - *

- * * @author Fei Yang */ @Controller public class OrgManageController { - private static IUserManagementService userManagementService; - @Autowired - private WebApplicationContext applicationContext; + private ISecurityService securityService; + @Autowired + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping(path = "/orgmanage") public String unspecified(@ModelAttribute OrgManageForm orgManageForm, HttpServletRequest request, HttpServletResponse response) throws Exception { - initServices(); - // Get organisation whose child organisations we will populate the OrgManageForm with Integer orgId = WebUtil.readIntParam(request, "org", true); @@ -91,7 +84,6 @@ // get logged in user's id Integer userId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID(); - ISecurityService securityService = AdminServiceProxy.getSecurityService(applicationContext.getServletContext()); Organisation org = null; boolean isRootOrganisation = false; @@ -117,7 +109,6 @@ int numUsers = org == rootOrganisation ? userManagementService.getCountUsers() : userManagementService.getUsersFromOrganisation(orgId).size(); String key = org == rootOrganisation ? "label.users.in.system" : "label.users.in.group"; - MessageService messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); request.setAttribute("numUsers", messageService.getMessage(key, new String[] { String.valueOf(numUsers) })); // Set OrgManageForm @@ -165,8 +156,6 @@ @RequestMapping("/orgmanage/getOrgs") @ResponseBody public String getOrgs(HttpServletRequest request, HttpServletResponse res) throws IOException, ServletException { - initServices(); - Integer parentOrgId = WebUtil.readIntParam(request, "parentOrgId"); Integer stateId = WebUtil.readIntParam(request, "stateId"); Integer typeIdParam = WebUtil.readIntParam(request, "type"); @@ -229,12 +218,4 @@ res.setContentType("application/json;charset=utf-8"); return responseJSON.toString(); } - - private void initServices() { - if (userManagementService == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getWebApplicationContext(applicationContext.getServletContext()); - userManagementService = (UserManagementService) ctx.getBean("userManagementService"); - } - } } \ No newline at end of file Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java =================================================================== diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java (.../OrgPasswordChangeController.java) (revision 198db26e45c4083d69e39fcd40ffed3f7918fc58) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java (.../OrgPasswordChangeController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -39,10 +39,11 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.admin.AdminConstants; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.OrgPasswordChangeForm; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.integration.security.RandomPasswordGenerator; +import org.lamsfoundation.lams.integration.service.IIntegrationService; +import org.lamsfoundation.lams.security.ISecurityService; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; @@ -56,12 +57,12 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.WebApplicationContext; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; @@ -70,18 +71,24 @@ @Controller @RequestMapping("/orgPasswordChange") public class OrgPasswordChangeController { - private static Logger log = Logger.getLogger(OrgPasswordChangeController.class); @Autowired - private WebApplicationContext applicationContext; + private IEventNotificationService eventNotificationService; + @Autowired + private IIntegrationService integrationService; + @Autowired + private ISecurityService securityService; + @Autowired + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping("/start") public String unspecified(@ModelAttribute OrgPasswordChangeForm orgPasswordChangeForm, HttpServletRequest request) { Integer organisationID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID); orgPasswordChangeForm.setOrganisationID(organisationID); - IUserManagementService userManagementService = AdminServiceProxy - .getService(applicationContext.getServletContext()); Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, organisationID); orgPasswordChangeForm.setOrgName(organisation.getName()); orgPasswordChangeForm.setStaffChange(true); @@ -108,8 +115,7 @@ UserDTO userDTO = getUserDTO(); Integer currentUserId = userDTO.getUserID(); - if (!AdminServiceProxy.getSecurityService(applicationContext.getServletContext()).isSysadmin(currentUserId, - "get grid users for org password change", false)) { + if (!securityService.isSysadmin(currentUserId, "get grid users for org password change", false)) { String warning = "User " + currentUserId + " is not a sysadmin"; log.warn(warning); response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); @@ -173,8 +179,7 @@ UserDTO userDTO = getUserDTO(); Integer currentUserId = userDTO.getUserID(); // security check - if (!AdminServiceProxy.getSecurityService(applicationContext.getServletContext()).isSysadmin(currentUserId, - "org password change", false)) { + if (!securityService.isSysadmin(currentUserId, "org password change", false)) { String warning = "User " + currentUserId + " is not a sysadmin"; log.warn(warning); response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); @@ -223,9 +228,8 @@ } private void notifyOnPasswordChange(Collection userIDs, String password) { - MessageService messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - AdminServiceProxy.getEventNotificationService(applicationContext.getServletContext()).sendMessage(null, - userIDs.toArray(new Integer[] {}), IEventNotificationService.DELIVERY_METHOD_MAIL, + eventNotificationService.sendMessage(null, userIDs.toArray(new Integer[] {}), + IEventNotificationService.DELIVERY_METHOD_MAIL, messageService.getMessage("admin.org.password.change.email.subject"), messageService.getMessage("admin.org.password.change.email.body", new String[] { password }), false); } @@ -240,8 +244,6 @@ throw new IllegalArgumentException("Both included and excluded users arrays must not be passed together"); } Set changedUserIDs = new TreeSet<>(); - IUserManagementService userManagementService = AdminServiceProxy - .getService(applicationContext.getServletContext()); UserDTO currentUserDTO = getUserDTO(); User currentUser = (User) userManagementService.findById(User.class, currentUserDTO.getUserID()); for (User user : users) { @@ -293,8 +295,6 @@ */ @SuppressWarnings("unchecked") private List getUsersByRole(Integer organisationID, boolean isStaff) { - IUserManagementService userManagementService = AdminServiceProxy - .getService(applicationContext.getServletContext()); Set staff = new HashSet<>(); staff.addAll(userManagementService.getUsersFromOrganisationByRole(organisationID, Role.AUTHOR, true)); staff.addAll(userManagementService.getUsersFromOrganisationByRole(organisationID, Role.MONITOR, true)); @@ -314,8 +314,6 @@ * Gets sorted users for grids */ private List getUsersByRole(Integer organisationID, boolean isStaff, String sortBy, String sortOrder) { - IUserManagementService userManagementService = AdminServiceProxy - .getService(applicationContext.getServletContext()); List staff = userManagementService.getAllUsers(organisationID, new String[] { Role.AUTHOR, Role.MONITOR }, null, null, sortBy, sortOrder, null); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java =================================================================== diff -u -r8d8232ae7142c30068360a2a41bbcccc065e775b -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java (.../OrgSaveController.java) (revision 8d8232ae7142c30068360a2a41bbcccc065e775b) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java (.../OrgSaveController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -31,7 +31,6 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.OrganisationForm; import org.lamsfoundation.lams.logevent.LogEvent; import org.lamsfoundation.lams.logevent.service.ILogEventService; @@ -45,48 +44,35 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; /** - * @version - * - *

- * View Source - *

- * * @author Fei Yang - * - * Created at 16:42:53 on 2006-6-7 */ - @Controller public class OrgSaveController { private static Logger log = Logger.getLogger(OrgSaveController.class); - private static IUserManagementService service; + + @Autowired + private ILogEventService logEventService; + @Autowired + private IUserManagementService userManagementService; + + @Autowired + @Qualifier("adminMessageService") private MessageService messageService; - @Autowired - private WebApplicationContext applicationContext; - @RequestMapping(path = "/orgsave") public String execute(@ModelAttribute OrganisationForm organisationForm, BindingResult bindingResult, HttpServletRequest request, HttpServletResponse response) throws Exception { - if (service == null) { - service = AdminServiceProxy.getService(applicationContext.getServletContext()); - } - if (messageService == null) { - messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - } - Integer orgId = organisationForm.getOrgId(); Organisation org; @@ -102,12 +88,12 @@ if (errorMap.isEmpty()) { HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - OrganisationState state = (OrganisationState) service.findById(OrganisationState.class, + OrganisationState state = (OrganisationState) userManagementService.findById(OrganisationState.class, organisationForm.getStateId()); if (orgId != null) { - if (service.canEditGroup(user.getUserID(), orgId)) { - org = (Organisation) service.findById(Organisation.class, orgId); + if (userManagementService.canEditGroup(user.getUserID(), orgId)) { + org = (Organisation) userManagementService.findById(Organisation.class, orgId); // set archived date only when it first changes to become archived if (state.getOrganisationStateId().equals(OrganisationState.ARCHIVED) && !org.getOrganisationState() .getOrganisationStateId().equals(OrganisationState.ARCHIVED)) { @@ -124,16 +110,16 @@ org = new Organisation(); BeanUtils.copyProperties(org, organisationForm); org.setParentOrganisation( - (Organisation) service.findById(Organisation.class, organisationForm.getParentId())); + (Organisation) userManagementService.findById(Organisation.class, organisationForm.getParentId())); org.setOrganisationType( - (OrganisationType) service.findById(OrganisationType.class, organisationForm.getTypeId())); + (OrganisationType) userManagementService.findById(OrganisationType.class, organisationForm.getTypeId())); writeAuditLog(user, org, organisationForm, org.getOrganisationState()); } org.setOrganisationState(state); if (log.isDebugEnabled()) { log.debug("orgId: " + org.getOrganisationId() + " create date: " + org.getCreateDate()); } - org = service.saveOrganisation(org, user.getUserID()); + org = userManagementService.saveOrganisation(org, user.getUserID()); request.setAttribute("org", organisationForm.getParentId()); return "forward:/orgmanage.do"; @@ -145,11 +131,6 @@ private void writeAuditLog(UserDTO user, Organisation org, OrganisationForm orgForm, OrganisationState newState) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - ILogEventService logEventService = (ILogEventService) ctx.getBean("logEventService"); - MessageService messageService = (MessageService) ctx.getBean("adminMessageService"); - String message; // audit log entries for organisation attribute changes Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java (.../OrganisationController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java (.../OrganisationController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -33,9 +33,10 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.OrganisationForm; import org.lamsfoundation.lams.lesson.Lesson; +import org.lamsfoundation.lams.monitoring.service.IMonitoringService; +import org.lamsfoundation.lams.security.ISecurityService; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationState; import org.lamsfoundation.lams.usermanagement.OrganisationType; @@ -47,33 +48,35 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.WebApplicationContext; /** * @author Fei Yang */ @Controller @RequestMapping("/organisation") public class OrganisationController { - - private static IUserManagementService service; - private static MessageService messageService; - private static List status; - private static Logger log = Logger.getLogger(OrganisationController.class); @Autowired - private WebApplicationContext applicationContext; + private IMonitoringService monitoringService; + @Autowired + private ISecurityService securityService; + @Autowired + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; + + private static List status; @RequestMapping(path = "/edit") public String edit(@ModelAttribute OrganisationForm organisationForm, HttpServletRequest request) throws Exception { - - OrganisationController.service = AdminServiceProxy.getService(applicationContext.getServletContext()); initLocalesAndStatus(); Integer orgId = WebUtil.readIntParam(request, "orgId", true); @@ -83,10 +86,10 @@ if (userDto != null) { Integer userId = userDto.getUserID(); // sysadmin, global group admin, group manager, group admin can edit group - if (OrganisationController.service.canEditGroup(userId, orgId)) { + if (userManagementService.canEditGroup(userId, orgId)) { // edit existing organisation if (orgId != null) { - Organisation org = (Organisation) OrganisationController.service.findById(Organisation.class, + Organisation org = (Organisation) userManagementService.findById(Organisation.class, orgId); BeanUtils.copyProperties(organisationForm, org); organisationForm.setParentId(org.getParentOrganisation().getOrganisationId()); @@ -106,9 +109,9 @@ } request.setAttribute("courseToDeleteLessons", courseToDeleteLessons); } - request.getSession().setAttribute("status", OrganisationController.status); - if (OrganisationController.service.isUserSysAdmin() - || OrganisationController.service.isUserGlobalGroupAdmin()) { + request.getSession().setAttribute("status", status); + if (userManagementService.isUserSysAdmin() + || userManagementService.isUserGlobalGroupAdmin()) { return "organisation/createOrEdit"; } else { return "organisation/courseAdminEdit"; @@ -123,10 +126,9 @@ @RequestMapping(path = "/create") public String create(@ModelAttribute OrganisationForm organisationForm, HttpServletRequest request) throws Exception { - OrganisationController.service = AdminServiceProxy.getService(applicationContext.getServletContext()); initLocalesAndStatus(); - if (!(request.isUserInRole(Role.SYSADMIN) || OrganisationController.service.isUserGlobalGroupAdmin())) { + if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupAdmin())) { // only sysadmins and global group admins can create groups if (((organisationForm.getTypeId() != null) && organisationForm.getTypeId().equals(OrganisationType.COURSE_TYPE)) @@ -139,11 +141,11 @@ organisationForm.setOrgId(null); Integer parentId = WebUtil.readIntParam(request, "parentId", true); if (parentId != null) { - Organisation parentOrg = (Organisation) OrganisationController.service.findById(Organisation.class, + Organisation parentOrg = (Organisation) userManagementService.findById(Organisation.class, parentId); organisationForm.setParentName(parentOrg.getName()); } - request.getSession().setAttribute("status", OrganisationController.status); + request.getSession().setAttribute("status", status); return "organisation/createOrEdit"; } @@ -154,8 +156,7 @@ @ResponseBody public String getOrganisationIdByName(HttpServletRequest request, HttpServletResponse response) throws IOException { String organisationName = WebUtil.readStrParam(request, "name"); - OrganisationController.service = AdminServiceProxy.getService(applicationContext.getServletContext()); - List organisations = service.findByProperty(Organisation.class, "name", organisationName); + List organisations = userManagementService.findByProperty(Organisation.class, "name", organisationName); if (!organisations.isEmpty()) { response.setContentType("text/plain;charset=utf-8"); response.getWriter().print(organisations.get(0).getOrganisationId()); @@ -165,22 +166,19 @@ @RequestMapping(path = "/deleteAllLessonsInit", method = RequestMethod.POST) public String deleteAllLessonsInit(HttpServletRequest request, HttpServletResponse response) throws IOException { - if (!AdminServiceProxy.getSecurityService(applicationContext.getServletContext()).isSysadmin(getUserID(), - "display cleanup preview lessons", false)) { + if (!securityService.isSysadmin(getUserID(), "display cleanup preview lessons", false)) { response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a sysadmin"); return null; } if (!(request.isUserInRole(Role.SYSADMIN))) { request.setAttribute("errorName", "OrganisationAction"); - request.setAttribute("errorMessage", AdminServiceProxy - .getMessageService(applicationContext.getServletContext()).getMessage("error.need.sysadmin")); + request.setAttribute("errorMessage", messageService.getMessage("error.need.sysadmin")); return "error"; } Integer organisationId = WebUtil.readIntParam(request, "orgId"); - Organisation organisation = (Organisation) AdminServiceProxy.getService(applicationContext.getServletContext()) - .findById(Organisation.class, organisationId); + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, organisationId); int lessonCount = organisation.getLessons().size(); request.setAttribute("lessonCount", lessonCount); request.setAttribute("courseName", organisation.getName()); @@ -193,13 +191,11 @@ Integer userID = getUserID(); Integer limit = WebUtil.readIntParam(request, "limit", true); Integer organisationId = WebUtil.readIntParam(request, "orgId"); - Organisation organisation = (Organisation) AdminServiceProxy.getService(applicationContext.getServletContext()) - .findById(Organisation.class, organisationId); + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, organisationId); for (Lesson lesson : (Set) organisation.getLessons()) { log.info("Deleting lesson: " + lesson.getLessonId()); // role is checked in this method - AdminServiceProxy.getMonitoringService(applicationContext.getServletContext()) - .removeLessonPermanently(lesson.getLessonId(), userID); + monitoringService.removeLessonPermanently(lesson.getLessonId(), userID); if (limit != null) { limit--; if (limit == 0) { @@ -208,19 +204,16 @@ } } - organisation = (Organisation) AdminServiceProxy.getService(applicationContext.getServletContext()) - .findById(Organisation.class, organisationId); + organisation = (Organisation) userManagementService.findById(Organisation.class, organisationId); response.setContentType("application/json;charset=utf-8"); response.getWriter().print(organisation.getLessons().size()); return null; } @RequestMapping("/error") public String error(HttpServletRequest request) { - OrganisationController.messageService = AdminServiceProxy - .getMessageService(applicationContext.getServletContext()); request.setAttribute("errorName", "OrganisationAction"); - request.setAttribute("errorMessage", OrganisationController.messageService.getMessage("error.authorisation")); + request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } @@ -232,8 +225,8 @@ @SuppressWarnings("unchecked") private void initLocalesAndStatus() { - if ((OrganisationController.status == null) && (OrganisationController.service != null)) { - OrganisationController.status = OrganisationController.service.findAll(OrganisationState.class); + if ((status == null) && (userManagementService != null)) { + status = userManagementService.findAll(OrganisationState.class); } } } \ No newline at end of file Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java =================================================================== diff -u -r95b456e2d455b045b20b696f2a749c0e3cc35917 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java (.../PolicyManagementController.java) (revision 95b456e2d455b045b20b696f2a749c0e3cc35917) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java (.../PolicyManagementController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -25,7 +25,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -45,14 +44,11 @@ @Controller @RequestMapping("policyManagement") public class PolicyManagementController { - private static Logger log = Logger.getLogger(PolicyManagementController.class); @Autowired - @Qualifier("policyService") private IPolicyService policyService; @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; @RequestMapping("list") Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java =================================================================== diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java (.../PortraitBatchUploadController.java) (revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java (.../PortraitBatchUploadController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -51,16 +51,15 @@ @Controller public class PortraitBatchUploadController { - private static IUserManagementService userManagementService; - private static ISecurityService securityService; - @Autowired - private WebApplicationContext applicationContext; + private IUserManagementService userManagementService; + @Autowired + private ISecurityService securityService; @RequestMapping("/uploadPortraits") @ResponseBody public String execute(HttpServletRequest request, HttpServletResponse response) throws IOException { - if (!getSecurityService().isSysadmin(getUserID(), "batch upload portraits", false)) { + if (!securityService.isSysadmin(getUserID(), "batch upload portraits", false)) { response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a sysadmin"); return null; } @@ -69,7 +68,7 @@ Integer maxUserId = WebUtil.readIntParam(request, "maxUserID"); String prefix = request.getParameter("prefix"); - List uploadedUserNames = getUserManagementService().uploadPortraits(minUserId, maxUserId, prefix); + List uploadedUserNames = userManagementService.uploadPortraits(minUserId, maxUserId, prefix); if (uploadedUserNames != null) { response.setCharacterEncoding("UTF-8"); response.setContentType("text/plain"); @@ -89,22 +88,4 @@ UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); return user == null ? null : user.getUserID(); } - - private IUserManagementService getUserManagementService() { - if (userManagementService == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - userManagementService = (IUserManagementService) ctx.getBean("userManagementService"); - } - return userManagementService; - } - - private ISecurityService getSecurityService() { - if (securityService == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - securityService = (ISecurityService) ctx.getBean("securityService"); - } - return securityService; - } } \ No newline at end of file Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ScheduledJobListController.java =================================================================== diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ScheduledJobListController.java (.../ScheduledJobListController.java) (revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ScheduledJobListController.java (.../ScheduledJobListController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -47,30 +47,20 @@ /** * * @author Steve.Ni - * @version $Revision$ - * - * - * - * */ @Controller public class ScheduledJobListController { - private static final Logger log = Logger.getLogger(ScheduledJobListController.class); - + @Autowired - private WebApplicationContext applicationContext; + private Scheduler scheduler; /** * Get all waitting queue jobs scheduled in Quartz table and display job name, job start time and description. The * description will be in format "Lesson Name":"the lesson creator", or "The gate name":"The relatived lesson name". */ @RequestMapping(path = "/joblist", method = RequestMethod.POST) public String execute(HttpServletRequest request) throws Exception { - - WebApplicationContext ctx = WebApplicationContextUtils - .getWebApplicationContext(this.applicationContext.getServletContext()); - Scheduler scheduler = (Scheduler) ctx.getBean("scheduler"); ArrayList jobList = new ArrayList<>(); try { Set jobKeys = scheduler.getJobKeys(GroupMatcher.jobGroupEquals(Scheduler.DEFAULT_GROUP)); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerListController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerListController.java (.../ServerListController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerListController.java (.../ServerListController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -27,13 +27,11 @@ import javax.servlet.http.HttpServletRequest; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.integration.ExtServer; +import org.lamsfoundation.lams.integration.service.IIntegrationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * @@ -43,12 +41,11 @@ public class ServerListController { @Autowired - private WebApplicationContext applicationContext; + private IIntegrationService integrationService; @RequestMapping(path = "/serverlist") public String execute(HttpServletRequest request) throws Exception { - List extServers = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext()) - .getAllExtServers(); + List extServers = integrationService.getAllExtServers(); Collections.sort(extServers); request.setAttribute("servers", extServers); return "serverlist"; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java =================================================================== diff -u -rfe0cf553a1a8c8af7594f72d10cd47e1ab225c93 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java (.../ServerMaintainController.java) (revision fe0cf553a1a8c8af7594f72d10cd47e1ab225c93) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java (.../ServerMaintainController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -25,68 +25,66 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.beanutils.BeanUtils; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.ExtServerForm; import org.lamsfoundation.lams.integration.ExtServer; import org.lamsfoundation.lams.integration.service.IIntegrationService; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** - *

- * View Source - *

- * * @author Fei Yang */ @Controller @RequestMapping("/servermaintain") public class ServerMaintainController { @Autowired - private WebApplicationContext applicationContext; + private IIntegrationService integrationService; + @Autowired + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping(path = "/edit") public String edit(@ModelAttribute ExtServerForm extServerForm, HttpServletRequest request) throws Exception { Integer sid = WebUtil.readIntParam(request, "sid", true); if (sid != null) { - ExtServer map = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext()) - .getExtServer(sid); + ExtServer map = integrationService.getExtServer(sid); BeanUtils.copyProperties(extServerForm, map); } return "servermaintain"; } @RequestMapping(path = "/disable") public String disable(HttpServletRequest request) throws Exception { - IIntegrationService service = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext()); Integer sid = WebUtil.readIntParam(request, "sid", false); - ExtServer map = service.getExtServer(sid); + ExtServer map = integrationService.getExtServer(sid); map.setDisabled(true); - service.saveExtServer(map); + integrationService.saveExtServer(map); return "forward:/serverlist.do"; } @RequestMapping(path = "/enable") public String enable(HttpServletRequest request) throws Exception { - IIntegrationService service = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext()); Integer sid = WebUtil.readIntParam(request, "sid", false); - ExtServer map = service.getExtServer(sid); + ExtServer map = integrationService.getExtServer(sid); map.setDisabled(false); - service.saveExtServer(map); + integrationService.saveExtServer(map); return "forward:/serverlist.do"; } @RequestMapping(path = "/delete") public String delete(HttpServletRequest request) throws Exception { Integer sid = WebUtil.readIntParam(request, "sid", false); - AdminServiceProxy.getService(applicationContext.getServletContext()).deleteById(ExtServer.class, sid); + userManagementService.deleteById(ExtServer.class, sid); return "forward:/serverlist.do"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java =================================================================== diff -u -r8d8232ae7142c30068360a2a41bbcccc065e775b -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java (.../ServerSaveController.java) (revision 8d8232ae7142c30068360a2a41bbcccc065e775b) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java (.../ServerSaveController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -29,46 +29,38 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang.StringUtils; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.ExtServerForm; import org.lamsfoundation.lams.integration.ExtServer; import org.lamsfoundation.lams.integration.service.IIntegrationService; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; /** - *

- * View Source - *

- * * @author Fei Yang */ @Controller public class ServerSaveController { - private static IIntegrationService service; - private static IUserManagementService userService; - private static MessageService messageService; - @Autowired - private WebApplicationContext applicationContext; + private IIntegrationService integrationService; + @Autowired + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping(path = "/serversave") public String execute(@ModelAttribute ExtServerForm extServerForm, BindingResult bindingResult, HttpServletRequest request, HttpServletResponse response) throws Exception { - service = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext()); - userService = AdminServiceProxy.getService(applicationContext.getServletContext()); - messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - MultiValueMap errorMap = new LinkedMultiValueMap<>(); if (StringUtils.trimToNull(extServerForm.getServerid()) == null) { @@ -94,7 +86,7 @@ Integer sid = extServerForm.getSid(); if (errorMap.isEmpty()) {//check duplication - List listServer = userService.findByProperty(ExtServer.class, "serverid", + List listServer = userManagementService.findByProperty(ExtServer.class, "serverid", extServerForm.getServerid()); if (listServer != null && listServer.size() > 0) { if (sid.equals(-1)) {//new map @@ -109,7 +101,7 @@ } } - List listPrefix = userService.findByProperty(ExtServer.class, "prefix", + List listPrefix = userManagementService.findByProperty(ExtServer.class, "prefix", extServerForm.getPrefix()); if (listPrefix != null && listPrefix.size() > 0) { if (sid.equals(0)) {//new map @@ -133,10 +125,10 @@ map.setSid(null); map.setServerTypeId(ExtServer.INTEGRATION_SERVER_TYPE); } else { - map = service.getExtServer(sid); + map = integrationService.getExtServer(sid); BeanUtils.copyProperties(map, extServerForm); } - service.saveExtServer(map); + integrationService.saveExtServer(map); return "forward:/serverlist.do"; } else { request.setAttribute("errorMap", errorMap); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java =================================================================== diff -u -re952488de6475350bc2fab3272b5350b3a7a6d51 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java (.../SignupManagementController.java) (revision e952488de6475350bc2fab3272b5350b3a7a6d51) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java (.../SignupManagementController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -26,20 +26,15 @@ @Controller @RequestMapping("/signupManagement") public class SignupManagementController { - private static Logger log = Logger.getLogger(SignupManagementController.class); @Autowired - @Qualifier("signupService") private ISignupService signupService = null; - @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService = null; - @Autowired @Qualifier("adminMessageService") - private MessageService adminMessageService; + private MessageService messageService; @RequestMapping("/start") public String execute(HttpServletRequest request) { @@ -93,10 +88,10 @@ // validate if (!StringUtils.equals(signupForm.getCourseKey(), signupForm.getConfirmCourseKey())) { - errorMap.add("courseKey", adminMessageService.getMessage("error.course.keys.unequal")); + errorMap.add("courseKey", messageService.getMessage("error.course.keys.unequal")); } if (signupService.contextExists(signupForm.getSignupOrganisationId(), signupForm.getContext())) { - errorMap.add("context", adminMessageService.getMessage("error.context.exists")); + errorMap.add("context", messageService.getMessage("error.context.exists")); } if (!errorMap.isEmpty()) { Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java =================================================================== diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java (.../StatisticsController.java) (revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java (.../StatisticsController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -26,17 +26,17 @@ import javax.servlet.http.HttpServletRequest; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.statistics.dto.GroupStatisticsDTO; import org.lamsfoundation.lams.statistics.dto.StatisticsDTO; import org.lamsfoundation.lams.statistics.service.IStatisticsService; import org.lamsfoundation.lams.usermanagement.Role; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * Gives the overall statistics for a LAMS server @@ -47,26 +47,24 @@ @RequestMapping("/statistics") public class StatisticsController { - private static IStatisticsService statisticsService; - @Autowired - private WebApplicationContext applicationContext; + private IStatisticsService statisticsService; + @Autowired + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping(path = "/start") public String unspecified(HttpServletRequest request) throws Exception { // check permission if (!request.isUserInRole(Role.SYSADMIN)) { request.setAttribute("errorName", "StatisticsAction"); - request.setAttribute("errorMessage", AdminServiceProxy - .getMessageService(applicationContext.getServletContext()).getMessage("error.authorisation")); + request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } - if (statisticsService == null) { - statisticsService = AdminServiceProxy.getStatisticsService(applicationContext.getServletContext()); - } - StatisticsDTO stats = statisticsService.getOverallStatistics(); Map groupMap = statisticsService.getGroupMap(); @@ -84,15 +82,10 @@ // check permission if (!request.isUserInRole(Role.SYSADMIN)) { request.setAttribute("errorName", "StatisticsAction"); - request.setAttribute("errorMessage", AdminServiceProxy - .getMessageService(applicationContext.getServletContext()).getMessage("error.authorisation")); + request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } - if (statisticsService == null) { - statisticsService = AdminServiceProxy.getStatisticsService(applicationContext.getServletContext()); - } - GroupStatisticsDTO groupStats = statisticsService.getGroupStatisticsDTO(orgId); request.setAttribute("groupStatisticsDTO", groupStats); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java (.../SysAdminStartController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java (.../SysAdminStartController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -27,14 +27,14 @@ import javax.servlet.http.HttpServletRequest; import org.lamsfoundation.lams.admin.AdminConstants; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.dto.LinkBean; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.util.MessageService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; /** * @author jliew @@ -43,16 +43,14 @@ @Controller public class SysAdminStartController { - private static IUserManagementService service; - @Autowired - private WebApplicationContext applicationContext; + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping(path = "/sysadminstart") public String execute(HttpServletRequest request) throws Exception { - - service = AdminServiceProxy.getService(applicationContext.getServletContext()); - ArrayList groupedLinks = new ArrayList<>(); if (request.isUserInRole(Role.SYSADMIN)) { @@ -84,7 +82,7 @@ links.add(new LinkBean("ldap/start.do", "sysadmin.ldap.configuration")); groupedLinks.add(new Object[] { AdminConstants.START_COURSE_LINKS, links }); - } else if (service.isUserGlobalGroupAdmin()) { + } else if (userManagementService.isUserGlobalGroupAdmin()) { ArrayList links = new ArrayList<>(); links.add(new LinkBean("usersearch.do", "admin.user.find")); links.add(new LinkBean("importgroups.do", "sysadmin.import.groups.title")); @@ -94,8 +92,7 @@ } else { request.setAttribute("errorName", "SysAdminStartAction"); - request.setAttribute("errorMessage", AdminServiceProxy - .getMessageService(applicationContext.getServletContext()).getMessage("error.authorisation")); + request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ThemeManagementController.java =================================================================== diff -u -r472fb979e3afdb43a7d537e588c5204554ba9f38 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ThemeManagementController.java (.../ThemeManagementController.java) (revision 472fb979e3afdb43a7d537e588c5204554ba9f38) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ThemeManagementController.java (.../ThemeManagementController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -27,21 +27,19 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.ThemeForm; import org.lamsfoundation.lams.themes.Theme; import org.lamsfoundation.lams.themes.service.IThemeService; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.util.CSSThemeUtil; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; +import org.lamsfoundation.lams.util.MessageService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; /** * Actions for maintaining and altering system themes @@ -52,30 +50,27 @@ @RequestMapping("/themeManagement") public class ThemeManagementController { - private static IThemeService themeService; - private static Configuration configurationService; - @Autowired - private WebApplicationContext applicationContext; + private IThemeService themeService; + @Autowired + private Configuration configurationService; + + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping("/start") public String unspecified(@ModelAttribute ThemeForm themeForm, HttpServletRequest request) throws Exception { // check permission if (!request.isUserInRole(Role.SYSADMIN)) { request.setAttribute("errorName", "ThemeManagementAction"); - request.setAttribute("errorMessage", AdminServiceProxy - .getMessageService(applicationContext.getServletContext()).getMessage("error.authorisation")); + request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } - if (ThemeManagementController.themeService == null) { - ThemeManagementController.themeService = AdminServiceProxy - .getThemeService(applicationContext.getServletContext()); - } - // Get all the themes - List themes = ThemeManagementController.themeService.getAllThemes(); + List themes = themeService.getAllThemes(); // Flag the default and un-editable themes String currentCSSTheme = Configuration.get(ConfigurationKeys.DEFAULT_THEME); @@ -95,23 +90,23 @@ // Update the theme Theme theme = null; if ((themeForm.getId() != null) && (themeForm.getId() != 0)) { - theme = ThemeManagementController.themeService.getTheme(themeForm.getId()); + theme = themeService.getTheme(themeForm.getId()); } else { theme = new Theme(); } updateThemeFromForm(theme, themeForm); - ThemeManagementController.themeService.saveOrUpdateTheme(theme); + themeService.saveOrUpdateTheme(theme); // Set the theme as default, or disable it as default. // Disabling restores the system default if ((themeForm.getCurrentDefaultTheme() != null) && (themeForm.getCurrentDefaultTheme() == true)) { Configuration.updateItem(ConfigurationKeys.DEFAULT_THEME, themeForm.getName()); - getConfiguration().persistUpdate(); + configurationService.persistUpdate(); } else { String currentTheme = Configuration.get(ConfigurationKeys.DEFAULT_THEME); if (themeForm.getName().equals(currentTheme)) { Configuration.updateItem(ConfigurationKeys.DEFAULT_THEME, CSSThemeUtil.DEFAULT_HTML_THEME); - getConfiguration().persistUpdate(); + configurationService.persistUpdate(); } } themeForm.clear(); @@ -124,13 +119,13 @@ // Remove the theme if (themeForm.getId() != null) { - ThemeManagementController.themeService.removeTheme(themeForm.getId()); + themeService.removeTheme(themeForm.getId()); } String currentTheme = Configuration.get(ConfigurationKeys.DEFAULT_THEME); if (themeForm.getName().equals(currentTheme)) { Configuration.updateItem(ConfigurationKeys.DEFAULT_THEME, CSSThemeUtil.DEFAULT_HTML_THEME); - getConfiguration().persistUpdate(); + configurationService.persistUpdate(); } themeForm.clear(); @@ -142,7 +137,7 @@ if (themeForm.getName() != null) { Configuration.updateItem(ConfigurationKeys.DEFAULT_THEME, themeForm.getName()); - getConfiguration().persistUpdate(); + configurationService.persistUpdate(); } themeForm.clear(); return unspecified(themeForm, request); @@ -155,14 +150,4 @@ // theme.setType(Integer.parseInt(form.getType())); no longer in form see LDEV-3674 return theme; } - - private Configuration getConfiguration() { - if (ThemeManagementController.configurationService == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - ThemeManagementController.configurationService = (Configuration) ctx.getBean("configurationService"); - - } - return ThemeManagementController.configurationService; - } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java =================================================================== diff -u -r8d8232ae7142c30068360a2a41bbcccc065e775b -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java (.../TimezoneManagementController.java) (revision 8d8232ae7142c30068360a2a41bbcccc065e775b) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java (.../TimezoneManagementController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.TimezoneForm; import org.lamsfoundation.lams.timezone.Timezone; import org.lamsfoundation.lams.timezone.dto.TimezoneDTO; @@ -40,35 +39,24 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * Implements time zone manager. * * @author Andrey Balan - * - * - * - * - * - * */ @Controller @RequestMapping("/timezonemanagement") public class TimezoneManagementController { - private static ITimezoneService timezoneService; - @Autowired - private WebApplicationContext applicationContext; + private ITimezoneService timezoneService; /** * Displays list of all JRE available timezones. */ @RequestMapping("/start") public String unspecified(@ModelAttribute TimezoneForm timezoneForm, HttpServletRequest request) throws Exception { - - timezoneService = AdminServiceProxy.getTimezoneService(applicationContext.getServletContext()); List defaultTimezones = timezoneService.getDefaultTimezones(); ArrayList timezoneDtos = new ArrayList<>(); @@ -108,9 +96,6 @@ @RequestMapping(path = "/serverTimezoneManagement") public String serverTimezoneManagement(@ModelAttribute TimezoneForm timezoneForm, HttpServletRequest request) throws Exception { - - timezoneService = AdminServiceProxy.getTimezoneService(applicationContext.getServletContext()); - ArrayList timezoneDtos = new ArrayList<>(); for (String availableTimezoneId : TimeZone.getAvailableIDs()) { TimeZone timeZone = TimeZone.getTimeZone(availableTimezoneId); @@ -130,8 +115,6 @@ @RequestMapping(path = "/changeServerTimezone") public String changeServerTimezone(@ModelAttribute TimezoneForm timezoneForm, HttpServletRequest request) throws Exception { - timezoneService = AdminServiceProxy.getTimezoneService(applicationContext.getServletContext()); - String timeZoneId = WebUtil.readStrParam(request, "timeZoneId"); timezoneService.setServerTimezone(timeZoneId); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java =================================================================== diff -u -r8d8232ae7142c30068360a2a41bbcccc065e775b -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision 8d8232ae7142c30068360a2a41bbcccc065e775b) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java (.../ToolContentListController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -36,7 +36,6 @@ import javax.sql.DataSource; import org.apache.commons.lang.StringUtils; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.learningdesign.LearningLibrary; import org.lamsfoundation.lams.learningdesign.LearningLibraryGroup; import org.lamsfoundation.lams.learningdesign.dto.LearningLibraryDTO; @@ -47,16 +46,15 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.JsonUtil; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -65,31 +63,27 @@ /** * @author jliew - * - * - * - * - * - * */ @Controller @RequestMapping("/toolcontentlist") public class ToolContentListController { - private static ILearningDesignService learningDesignService; - private static IUserManagementService userManagementService; - private static DataSource dataSource; - @Autowired - private WebApplicationContext applicationContext; + private ILearningDesignService learningDesignService; + @Autowired + private IUserManagementService userManagementService; + @Autowired + private DataSource dataSource; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping(path = "/start") public String execute(HttpServletRequest request) throws Exception { // check permission if (!(request.isUserInRole(Role.SYSADMIN))) { request.setAttribute("errorName", "ToolContentListAction"); - request.setAttribute("errorMessage", AdminServiceProxy - .getMessageService(applicationContext.getServletContext()).getMessage("error.authorisation")); + request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } @@ -115,7 +109,7 @@ } // get learning library dtos and their validity - List learningLibraryDTOs = getLearningDesignService().getAllLearningLibraryDetails(false, + List learningLibraryDTOs = learningDesignService.getAllLearningLibraryDetails(false, getUserLanguage()); // this is filled when executing following method, for efficiency purposes HashMap learningLibraryValidity = new HashMap<>(learningLibraryDTOs.size()); @@ -126,15 +120,15 @@ // get tool versions HashMap toolVersions = new HashMap<>(); - List tools = getUserManagementService().findAll(Tool.class); + List tools = userManagementService.findAll(Tool.class); for (Tool tool : tools) { toolVersions.put(tool.getToolId(), tool.getToolVersion()); } request.setAttribute("toolVersions", toolVersions); // get tool database versions HashMap dbVersions = new HashMap<>(); - Connection conn = getDataSource().getConnection(); + Connection conn = dataSource.getConnection(); PreparedStatement query = conn.prepareStatement("select system_name, patch_level from patches"); ResultSet results = query.executeQuery(); while (results.next()) { @@ -191,11 +185,9 @@ } private boolean checkPriviledge(HttpServletRequest request) { - if (!getUserManagementService().isUserSysAdmin()) { + if (!userManagementService.isUserSysAdmin()) { request.setAttribute("errorName", "ToolContentListAction"); - request.setAttribute("errorMessage", - AdminServiceProxy.getMessageService(applicationContext.getServletContext()) - .getMessage("error.no.sysadmin.priviledge")); + request.setAttribute("errorMessage", messageService.getMessage("error.no.sysadmin.priviledge")); return false; } return true; @@ -204,15 +196,15 @@ @RequestMapping("/disable") public String disableLibrary(HttpServletRequest request) { Long learningLibraryId = WebUtil.readLongParam(request, "libraryID", false); - ILearningDesignService ldService = getLearningDesignService(); + ILearningDesignService ldService = learningDesignService; ldService.setValid(learningLibraryId, false); return "forward:/toolcontentlist/start.do"; } @RequestMapping("/enable") public String enableLibrary(HttpServletRequest request) { Long learningLibraryId = WebUtil.readLongParam(request, "libraryID", false); - ILearningDesignService ldService = getLearningDesignService(); + ILearningDesignService ldService = learningDesignService; ldService.setValid(learningLibraryId, true); return "forward:/toolcontentlist/start.do"; } @@ -223,7 +215,7 @@ @RequestMapping(path = "/openLearningLibraryGroups") public String openLearningLibraryGroups(HttpServletRequest request) throws IOException { // build full list of available learning libraries - List learningLibraries = getLearningDesignService() + List learningLibraries = learningDesignService .getAllLearningLibraryDetails(getUserLanguage()); ArrayNode learningLibrariesJSON = JsonNodeFactory.instance.arrayNode(); for (LearningLibraryDTO learningLibrary : learningLibraries) { @@ -235,7 +227,7 @@ request.setAttribute("learningLibraries", learningLibrariesJSON.toString()); // build list of existing groups - List groups = getLearningDesignService().getLearningLibraryGroups(); + List groups = learningDesignService.getLearningLibraryGroups(); ArrayNode groupsJSON = JsonNodeFactory.instance.arrayNode(); for (LearningLibraryGroup group : groups) { ObjectNode groupJSON = JsonNodeFactory.instance.objectNode(); @@ -274,42 +266,13 @@ ArrayNode learningLibrariesJSON = (ArrayNode) groupJSON.get("learningLibraries"); for (JsonNode learningLibraryJSON : learningLibrariesJSON) { long learningLibraryId = learningLibraryJSON.asLong(); - LearningLibrary learningLibrary = getLearningDesignService().getLearningLibrary(learningLibraryId); + LearningLibrary learningLibrary = learningDesignService.getLearningLibrary(learningLibraryId); group.getLearningLibraries().add(learningLibrary); } } - getLearningDesignService().saveLearningLibraryGroups(groups); + learningDesignService.saveLearningLibraryGroups(groups); return "forward:/toolcontentlist/start.do"; } - - private ILearningDesignService getLearningDesignService() { - if (ToolContentListController.learningDesignService == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - ToolContentListController.learningDesignService = (ILearningDesignService) ctx - .getBean("learningDesignService"); - } - return ToolContentListController.learningDesignService; - } - - private IUserManagementService getUserManagementService() { - if (ToolContentListController.userManagementService == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - ToolContentListController.userManagementService = (IUserManagementService) ctx - .getBean("userManagementService"); - } - return ToolContentListController.userManagementService; - } - - private DataSource getDataSource() { - if (ToolContentListController.dataSource == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - ToolContentListController.dataSource = (DataSource) ctx.getBean("dataSource"); - } - return ToolContentListController.dataSource; - } } \ No newline at end of file Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserBasicListController.java =================================================================== diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserBasicListController.java (.../UserBasicListController.java) (revision d4dec47dab74477560cfee18e74c7e4494bd1426) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserBasicListController.java (.../UserBasicListController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -29,7 +29,6 @@ import javax.servlet.http.HttpSession; import org.apache.commons.lang.StringUtils; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.Role; @@ -42,27 +41,19 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * @author jliew - * - * - * - * */ @Controller public class UserBasicListController { - private static IUserManagementService service; - @Autowired - private WebApplicationContext applicationContext; + private IUserManagementService userManagementService; @RequestMapping(path = "/user/basiclist", method = RequestMethod.POST) public String execute(HttpServletRequest request) throws Exception { - UserBasicListController.service = AdminServiceProxy.getService(applicationContext.getServletContext()); HttpSession session = SessionManager.getSession(); if (session != null) { UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER); @@ -74,12 +65,12 @@ if (orgId != null) { if (!StringUtils.equals(potential, "1")) { // list users in org - List users = UserBasicListController.service.getUsersFromOrganisation(orgId); + List users = userManagementService.getUsersFromOrganisation(orgId); request.setAttribute("users", users); } else { // get all potential users of this org instead... filters results according to user's roles // get group - Organisation org = (Organisation) UserBasicListController.service.findById(Organisation.class, + Organisation org = (Organisation) userManagementService.findById(Organisation.class, orgId); Organisation group; if (org != null) { @@ -90,19 +81,17 @@ } // get users List users = new ArrayList(); - if (request.isUserInRole(Role.SYSADMIN) - || UserBasicListController.service.isUserGlobalGroupAdmin()) { - users = UserBasicListController.service.getAllUsers(org.getOrganisationId()); - } else if (UserBasicListController.service.isUserInRole(userId, group.getOrganisationId(), + if (request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupAdmin()) { + users = userManagementService.getAllUsers(org.getOrganisationId()); + } else if (userManagementService.isUserInRole(userId, group.getOrganisationId(), Role.GROUP_ADMIN) - || UserBasicListController.service.isUserInRole(userId, group.getOrganisationId(), + || userManagementService.isUserInRole(userId, group.getOrganisationId(), Role.GROUP_MANAGER)) { if (group.getCourseAdminCanBrowseAllUsers()) { - users = UserBasicListController.service.getAllUsers(org.getOrganisationId()); + users = userManagementService.getAllUsers(org.getOrganisationId()); } else if (org.getOrganisationType().getOrganisationTypeId() .equals(OrganisationType.CLASS_TYPE)) { - users = UserBasicListController.service.findUsers(null, group.getOrganisationId(), - orgId); + users = userManagementService.findUsers(null, group.getOrganisationId(), orgId); } } request.setAttribute("users", users); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java =================================================================== diff -u -r8d8232ae7142c30068360a2a41bbcccc065e775b -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java (.../UserController.java) (revision 8d8232ae7142c30068360a2a41bbcccc065e775b) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java (.../UserController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -33,7 +33,6 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.dto.UserOrgRoleDTO; import org.lamsfoundation.lams.admin.web.form.UserForm; import org.lamsfoundation.lams.logevent.LogEvent; @@ -61,55 +60,42 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; /** * @author Jun-Dir Liew */ @Controller @RequestMapping("/user") public class UserController { - private static Logger log = Logger.getLogger(UserController.class); - private IUserManagementService service; + + @Autowired + private ILogEventService logEventService; + @Autowired + @Qualifier("adminMessageService") private MessageService messageService; - private static IThemeService themeService; - private static ITimezoneService timezoneService; + @Autowired + private IThemeService themeService; + @Autowired + private ITimezoneService timezoneService; + @Autowired + private IUserManagementService userManagementService; + private static List locales; private static List authenticationMethods; - @Autowired - private WebApplicationContext applicationContext; - - private void initServices() { - if (service == null) { - service = AdminServiceProxy.getService(applicationContext.getServletContext()); - } - if (messageService == null) { - messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - } - if (UserController.themeService == null) { - UserController.themeService = AdminServiceProxy.getThemeService(applicationContext.getServletContext()); - } - if (UserController.timezoneService == null) { - UserController.timezoneService = AdminServiceProxy - .getTimezoneService(applicationContext.getServletContext()); - } - } - @RequestMapping(path = "/edit") public String edit(@ModelAttribute UserForm userForm, HttpServletRequest request) throws Exception { - - initServices(); - if (UserController.locales == null) { - UserController.locales = service.findAll(SupportedLocale.class); - Collections.sort(UserController.locales); + if (locales == null) { + locales = userManagementService.findAll(SupportedLocale.class); + Collections.sort(locales); } - if (UserController.authenticationMethods == null) { - UserController.authenticationMethods = service.findAll(AuthenticationMethod.class); + if (authenticationMethods == null) { + authenticationMethods = userManagementService.findAll(AuthenticationMethod.class); } Integer orgId = WebUtil.readIntParam(request, "orgId", true); @@ -119,11 +105,11 @@ userForm.setUserId(userId); // Get all the css themess - List themes = UserController.themeService.getAllThemes(); + List themes = themeService.getAllThemes(); request.setAttribute("themes", themes); // Select the default themes by default - Theme defaultTheme = UserController.themeService.getDefaultTheme(); + Theme defaultTheme = themeService.getDefaultTheme(); for (Theme theme : themes) { if (theme.getThemeId().equals(defaultTheme.getThemeId())) { userForm.setUserTheme(theme.getThemeId()); @@ -133,18 +119,18 @@ // test requestor's permission Organisation org = null; - Boolean canEdit = service.isUserGlobalGroupAdmin(); + Boolean canEdit = userManagementService.isUserGlobalGroupAdmin(); if (orgId != null) { - org = (Organisation) service.findById(Organisation.class, orgId); + org = (Organisation) userManagementService.findById(Organisation.class, orgId); if (!canEdit) { OrganisationType orgType = org.getOrganisationType(); Integer orgIdOfCourse = orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE) ? org.getParentOrganisation().getOrganisationId() : orgId; - User requestor = service.getUserByLogin(request.getRemoteUser()); - if (service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_ADMIN) - || service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_MANAGER)) { - Organisation course = (Organisation) service.findById(Organisation.class, orgIdOfCourse); + User requestor = userManagementService.getUserByLogin(request.getRemoteUser()); + if (userManagementService.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_ADMIN) + || userManagementService.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_MANAGER)) { + Organisation course = (Organisation) userManagementService.findById(Organisation.class, orgIdOfCourse); canEdit = course.getCourseAdminCanAddNewUsers(); } } @@ -158,8 +144,8 @@ // editing a user if ((userId != null) && (userId != 0)) { - User user = (User) service.findById(User.class, userId); - UserController.log.debug("got userid to edit: " + userId); + User user = (User) userManagementService.findById(User.class, userId); + log.debug("got userid to edit: " + userId); BeanUtils.copyProperties(userForm, user); userForm.setPassword(null); SupportedLocale locale = user.getLocale(); @@ -183,7 +169,7 @@ } // if still null, use the default if (userSelectedTheme == null) { - userSelectedTheme = UserController.themeService.getDefaultTheme().getThemeId(); + userSelectedTheme = themeService.getDefaultTheme().getThemeId(); } userForm.setUserTheme(userSelectedTheme); userForm.setInitialPortraitId(user.getPortraitUuid()); @@ -197,7 +183,7 @@ String country = LanguageUtil.getDefaultCountry(); userForm.setCountry(country); } catch (Exception e) { - UserController.log.debug(e); + log.debug(e); } Timezone serverTimezone = timezoneService.getServerTimezone(); @@ -211,7 +197,7 @@ } // Get all available time zones - List availableTimeZones = UserController.timezoneService.getDefaultTimezones(); + List availableTimeZones = timezoneService.getDefaultTimezones(); TreeSet timezoneDtos = new TreeSet<>(new TimezoneDTOComparator()); for (Timezone availableTimeZone : availableTimeZones) { String timezoneId = availableTimeZone.getTimezoneId(); @@ -226,24 +212,23 @@ if (org != null) { request.setAttribute("orgName", org.getName()); Organisation parentOrg = org.getParentOrganisation(); - if ((parentOrg != null) && !parentOrg.equals(service.getRootOrganisation())) { + if ((parentOrg != null) && !parentOrg.equals(userManagementService.getRootOrganisation())) { request.setAttribute("pOrgId", parentOrg.getOrganisationId()); request.setAttribute("parentName", parentOrg.getName()); } } - request.setAttribute("locales", UserController.locales); + request.setAttribute("locales", locales); request.setAttribute("countryCodes", LanguageUtil.getCountryCodes(false)); - request.setAttribute("authenticationMethods", UserController.authenticationMethods); + request.setAttribute("authenticationMethods", authenticationMethods); return "user"; } // display user's global roles, if any private UserOrgRoleDTO getGlobalRoles(User user) { - initServices(); - UserOrganisation uo = service.getUserOrganisation(user.getUserId(), - service.getRootOrganisation().getOrganisationId()); + UserOrganisation uo = userManagementService.getUserOrganisation(user.getUserId(), + userManagementService.getRootOrganisation().getOrganisationId()); if (uo == null) { return null; } @@ -261,10 +246,8 @@ // display user's organisations and roles in them @SuppressWarnings("unchecked") private List getUserOrgRoles(User user) { - - initServices(); List uorDTOs = new ArrayList<>(); - List uos = service.getUserOrganisationsForUserByTypeAndStatus(user.getLogin(), + List uos = userManagementService.getUserOrganisationsForUserByTypeAndStatus(user.getLogin(), OrganisationType.COURSE_TYPE, OrganisationState.ACTIVE); for (UserOrganisation uo : uos) { UserOrgRoleDTO uorDTO = new UserOrgRoleDTO(); @@ -276,7 +259,7 @@ uorDTO.setOrgName(uo.getOrganisation().getName()); uorDTO.setRoles(roles); List childDTOs = new ArrayList<>(); - List childuos = service.getUserOrganisationsForUserByTypeAndStatusAndParent( + List childuos = userManagementService.getUserOrganisationsForUserByTypeAndStatusAndParent( user.getLogin(), OrganisationType.CLASS_TYPE, OrganisationState.ACTIVE, uo.getOrganisation().getOrganisationId()); for (UserOrganisation childuo : childuos) { @@ -300,20 +283,17 @@ // determine whether to disable or delete user based on their lams data @RequestMapping(path = "/remove") public String remove(HttpServletRequest request) throws Exception { - - initServices(); - - if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) { + if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupAdmin())) { request.setAttribute("errorName", "UserAction"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } Integer orgId = WebUtil.readIntParam(request, "orgId", true); Integer userId = WebUtil.readIntParam(request, "userId"); - User user = (User) service.findById(User.class, userId); + User user = (User) userManagementService.findById(User.class, userId); - Boolean hasData = service.userHasData(user); + Boolean hasData = userManagementService.userHasData(user); request.setAttribute("method", (hasData ? "disable" : "delete")); request.setAttribute("orgId", orgId); @@ -323,10 +303,7 @@ @RequestMapping(path = "/disable") public String disable(HttpServletRequest request) throws Exception { - - initServices(); - - if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) { + if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupAdmin())) { request.setAttribute("errorName", "UserController"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; @@ -335,11 +312,10 @@ Integer orgId = WebUtil.readIntParam(request, "orgId", true); Integer userId = WebUtil.readIntParam(request, "userId"); - service.disableUser(userId); + userManagementService.disableUser(userId); String[] args = new String[1]; args[0] = userId.toString(); String message = messageService.getMessage("audit.user.disable", args); - ILogEventService logEventService = AdminServiceProxy.getLogEventService(applicationContext.getServletContext()); logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, sysadmin != null ? sysadmin.getUserID() : null, userId, null, null, message); if ((orgId == null) || (orgId == 0)) { @@ -352,10 +328,7 @@ @RequestMapping(path = "/delete") public String delete(HttpServletRequest request) throws Exception { - - initServices(); - - if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) { + if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupAdmin())) { request.setAttribute("errorName", "UserAction"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; @@ -365,7 +338,7 @@ Integer orgId = WebUtil.readIntParam(request, "orgId", true); Integer userId = WebUtil.readIntParam(request, "userId"); try { - service.removeUser(userId); + userManagementService.removeUser(userId); } catch (Exception e) { request.setAttribute("errorName", "UserController"); request.setAttribute("errorMessage", e.getMessage()); @@ -374,7 +347,6 @@ String[] args = new String[1]; args[0] = userId.toString(); String message = messageService.getMessage("audit.user.delete", args); - ILogEventService logEventService = AdminServiceProxy.getLogEventService(applicationContext.getServletContext()); logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, sysadmin != null ? sysadmin.getUserID() : null, userId, null, null, message); if ((orgId == null) || (orgId == 0)) { @@ -388,21 +360,18 @@ // called from disabled users screen @RequestMapping(path = "/enable") public String enable(HttpServletRequest request) throws Exception { - - initServices(); - - if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) { + if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupAdmin())) { request.setAttribute("errorName", "UserController"); request.setAttribute("errorMessage", messageService.getMessage("error.authorisation")); return "error"; } Integer userId = WebUtil.readIntParam(request, "userId", true); - User user = (User) service.findById(User.class, userId); + User user = (User) userManagementService.findById(User.class, userId); - UserController.log.debug("enabling user: " + userId); + log.debug("enabling user: " + userId); user.setDisabledFlag(false); - service.saveUser(user); + userManagementService.saveUser(user); return "forward:/disabledmanage.do"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java =================================================================== diff -u -r7525e7b5fda723cc9c2c81a78cd8be3785bad851 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java (.../UserManageController.java) (revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java (.../UserManageController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.dto.UserListDTO; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationType; @@ -44,39 +43,27 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * @author Jun-Dir Liew - * - * Created at 13:51:51 on 9/06/2006 */ - -/** - * - * - * - * - */ @Controller public class UserManageController { - private static final Logger log = Logger.getLogger(UserManageController.class); - private static IUserManagementService service; - private static MessageService messageService; - + @Autowired - private WebApplicationContext applicationContext; + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping(path = "/usermanage") public String execute(HttpServletRequest request, HttpServletResponse response) throws Exception { - - service = AdminServiceProxy.getService(applicationContext.getServletContext()); - messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - + // get id of org to list users for Integer orgId = WebUtil.readIntParam(request, "org", true); if (orgId == null) { @@ -88,7 +75,7 @@ log.debug("orgId: " + orgId); // get org name - Organisation organisation = (Organisation) service.findById(Organisation.class, orgId); + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, orgId); if (organisation == null) { return forwardError(request, "error.org.invalid"); } @@ -110,13 +97,13 @@ Organisation orgOfCourseAdmin = (orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) ? pOrg : organisation; // check permission - Integer rootOrgId = service.getRootOrganisation().getOrganisationId(); - if (request.isUserInRole(Role.SYSADMIN) || (service.isUserGlobalGroupAdmin() && !orgId.equals(rootOrgId))) { + Integer rootOrgId = userManagementService.getRootOrganisation().getOrganisationId(); + if (request.isUserInRole(Role.SYSADMIN) || (userManagementService.isUserGlobalGroupAdmin() && !orgId.equals(rootOrgId))) { userManageForm.setCourseAdminCanAddNewUsers(true); userManageForm.setCourseAdminCanBrowseAllUsers(true); request.setAttribute("canDeleteUser", true); - } else if ((service.isUserInRole(userId, orgOfCourseAdmin.getOrganisationId(), Role.GROUP_ADMIN) - || service.isUserInRole(userId, orgOfCourseAdmin.getOrganisationId(), Role.GROUP_MANAGER)) + } else if ((userManagementService.isUserInRole(userId, orgOfCourseAdmin.getOrganisationId(), Role.GROUP_ADMIN) + || userManagementService.isUserInRole(userId, orgOfCourseAdmin.getOrganisationId(), Role.GROUP_MANAGER)) && !orgId.equals(rootOrgId)) { userManageForm.setCourseAdminCanAddNewUsers(orgOfCourseAdmin.getCourseAdminCanAddNewUsers()); userManageForm.setCourseAdminCanBrowseAllUsers(orgOfCourseAdmin.getCourseAdminCanBrowseAllUsers()); @@ -127,7 +114,7 @@ userManageForm.setOrgId(orgId); userManageForm.setOrgName(orgName); - List userManageBeans = service.getUserManageBeans(orgId); + List userManageBeans = userManagementService.getUserManageBeans(orgId); Collections.sort(userManageBeans); userManageForm.setUserManageBeans(userManageBeans); request.setAttribute("userManageForm", userManageForm); @@ -149,13 +136,13 @@ roleCount.put(Role.GROUP_ADMIN, Role.ROLE_GROUP_ADMIN); } for (String role : roleCount.keySet()) { - Integer count = service.getCountRoleForOrg(orgId, roleCount.get(role), null); + Integer count = userManagementService.getCountRoleForOrg(orgId, roleCount.get(role), null); request.setAttribute(role.replace(' ', '_'), count); } // count users in the org // TODO use hql that does a count instead of getting whole objects - Integer numUsers = Integer.valueOf(service.getUsersFromOrganisation(orgId).size()); + Integer numUsers = Integer.valueOf(userManagementService.getUsersFromOrganisation(orgId).size()); args[0] = numUsers.toString(); request.setAttribute("numUsers", messageService.getMessage("label.users.in.group", args)); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java =================================================================== diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java (.../UserOrgController.java) (revision c9e22b65129fe7561d7e66f5d6338557b0f3236a) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java (.../UserOrgController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -26,54 +26,37 @@ import javax.servlet.http.HttpServletRequest; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.UserOrgForm; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * @author Jun-Dir Liew * */ - -/** - * - * - * - * - * - * - * - * - */ @Controller public class UserOrgController { - private static final Logger log = Logger.getLogger(UserOrgController.class); - private static IUserManagementService service; - private static MessageService messageService; - + @Autowired - private WebApplicationContext applicationContext; + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping(path = "/userorg") public String execute(@ModelAttribute UserOrgForm userOrgForm, HttpServletRequest request) throws Exception { - - service = AdminServiceProxy.getService(applicationContext.getServletContext()); - messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - Integer orgId = WebUtil.readIntParam(request, "orgId", true); log.debug("orgId: " + orgId); // get org name - Organisation organisation = (Organisation) service.findById(Organisation.class, orgId); + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, orgId); if ((orgId == null) || (orgId <= 0) || organisation == null) { request.setAttribute("errorName", "UserOrgController"); @@ -84,7 +67,7 @@ String orgName = organisation.getName(); log.debug("orgName: " + orgName); Organisation parentOrg = organisation.getParentOrganisation(); - if (parentOrg != null && !parentOrg.equals(service.getRootOrganisation())) { + if (parentOrg != null && !parentOrg.equals(userManagementService.getRootOrganisation())) { request.setAttribute("pOrgId", parentOrg.getOrganisationId()); request.setAttribute("pOrgName", parentOrg.getName()); } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java =================================================================== diff -u -r7525e7b5fda723cc9c2c81a78cd8be3785bad851 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java (.../UserOrgRoleController.java) (revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java (.../UserOrgRoleController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -32,7 +32,6 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.dto.UserBean; import org.lamsfoundation.lams.admin.web.form.UserOrgRoleForm; import org.lamsfoundation.lams.usermanagement.Organisation; @@ -41,44 +40,28 @@ import org.lamsfoundation.lams.usermanagement.UserOrganisation; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; /** * @author jliew * * Called when a user has added users to an organisation. * */ - -/** - * - * - * - * - * - * - * - * - */ @Controller public class UserOrgRoleController { - private static Logger log = Logger.getLogger(UserOrgRoleController.class); - private static IUserManagementService service; - + @Autowired - private WebApplicationContext applicationContext; + private IUserManagementService userManagementService; @RequestMapping(path = "/userorgrole") public String execute(@ModelAttribute UserOrgRoleForm userOrgRoleForm, BindingResult result, HttpServletRequest request, HttpSession session) throws Exception { - service = AdminServiceProxy.getService(applicationContext.getServletContext()); // make sure we don't have left overs from any previous attempt userOrgRoleForm.setUserBeans(new ArrayList()); @@ -88,14 +71,14 @@ Collections.sort(roles); request.setAttribute("roles", roles); - Organisation organisation = (Organisation) service.findById(Organisation.class, + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, (Integer) request.getAttribute("orgId")); userOrgRoleForm.setOrgId(organisation.getOrganisationId()); // display breadcrumb links request.setAttribute("orgName", organisation.getName()); Organisation parentOrg = organisation.getParentOrganisation(); - if (parentOrg != null && !parentOrg.equals(service.getRootOrganisation())) { + if (parentOrg != null && !parentOrg.equals(userManagementService.getRootOrganisation())) { request.setAttribute("pOrgId", parentOrg.getOrganisationId()); request.setAttribute("pOrgName", parentOrg.getName()); } @@ -110,7 +93,7 @@ // flag users that will be added to parent group if necessary userBean.setMemberOfParent(true); if (organisation.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) { - if (service.getUserOrganisation(user.getUserId(), + if (userManagementService.getUserOrganisation(user.getUserId(), organisation.getParentOrganisation().getOrganisationId()) == null) { userBean.setMemberOfParent(false); } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java =================================================================== diff -u -rd11fc4c9bde6900c905c40030cb0f0c0ef659e9a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java (.../UserOrgRoleSaveController.java) (revision d11fc4c9bde6900c905c40030cb0f0c0ef659e9a) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java (.../UserOrgRoleSaveController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.dto.UserBean; import org.lamsfoundation.lams.admin.web.form.UserOrgRoleForm; import org.lamsfoundation.lams.usermanagement.User; @@ -44,48 +43,28 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.SessionAttributes; -import org.springframework.web.context.WebApplicationContext; /** * @author jliew * * Saves roles for users that were just added. * Uses session scope because using request scope doesn't copy the form data * into UserOrgRoleForm's userBeans ArrayList (the list becomes empty). - * */ - -/** - * - * - * - * - * - * - * - * - * - */ @Controller @SessionAttributes("userOrgRoleForm") public class UserOrgRoleSaveController { - private static Logger log = Logger.getLogger(UserOrgRoleSaveController.class); - private static IUserManagementService service; - + @Autowired - private WebApplicationContext applicationContext; - + private IUserManagementService userManagementService; @Autowired @Qualifier("adminMessageService") - private MessageService adminMessageService; + private MessageService messageService; @RequestMapping(path = "/userorgrolesave", method = RequestMethod.POST) public String execute(@ModelAttribute UserOrgRoleForm userOrgRoleForm, HttpServletRequest request) throws Exception { - - service = AdminServiceProxy.getService(applicationContext.getServletContext()); - ArrayList userBeans = userOrgRoleForm.getUserBeans(); log.debug("userBeans is null? " + userBeans == null); Integer orgId = userOrgRoleForm.getOrgId(); @@ -98,18 +77,18 @@ // for subgroups, if user is not a member of the parent group then add to that as well. for (int i = 0; i < userBeans.size(); i++) { UserBean bean = (UserBean) userBeans.get(i); - User user = (User) service.findById(User.class, bean.getUserId()); + User user = (User) userManagementService.findById(User.class, bean.getUserId()); log.debug("userId: " + bean.getUserId()); String[] roleIds = bean.getRoleIds(); if (roleIds.length == 0) { // TODO forward to userorgrole.do, not userorg.do MultiValueMap errorMap = new LinkedMultiValueMap<>(); - errorMap.add("roles", adminMessageService.getMessage("error.roles.empty")); + errorMap.add("roles", messageService.getMessage("error.roles.empty")); request.setAttribute("errorMap", errorMap); request.setAttribute("orgId", orgId); return "forward:/userorg.do"; } - service.setRolesForUserOrganisation(user, orgId, Arrays.asList(roleIds)); + userManagementService.setRolesForUserOrganisation(user, orgId, Arrays.asList(roleIds)); // FMALIKOFF 5/7/7 Commented out the following code that set the roles in the course if the current org is a class, as the logic // is done in service.setRolesForUserOrganisation() //if (organisation.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) { Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java =================================================================== diff -u -rd11fc4c9bde6900c905c40030cb0f0c0ef659e9a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java (.../UserOrgSaveController.java) (revision d11fc4c9bde6900c905c40030cb0f0c0ef659e9a) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java (.../UserOrgSaveController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -33,7 +33,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.UserOrgForm; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.Role; @@ -44,45 +43,30 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * @author Jun-Dir Liew - * - * Created at 17:22:21 on 20/06/2006 */ - -/** - * - * - * - * - * - */ @Controller public class UserOrgSaveController { - private static Logger log = Logger.getLogger(UserOrgSaveController.class); - private static IUserManagementService service; + + @Autowired + private IUserManagementService userManagementService; private List rolelist; - @Autowired - private WebApplicationContext applicationContext; - @RequestMapping(path = "/userorgsave") public String execute(@ModelAttribute UserOrgForm userOrgForm, HttpServletRequest request, HttpServletResponse response) throws Exception { Integer orgId = userOrgForm.getOrgId(); request.setAttribute("org", orgId); - service = AdminServiceProxy.getService(applicationContext.getServletContext()); if (rolelist == null) { - rolelist = service.findAll(Role.class); + rolelist = userManagementService.findAll(Role.class); } - Organisation organisation = (Organisation) service.findById(Organisation.class, orgId); + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, orgId); Set uos = organisation.getUserOrganisations(); String[] userIds = userOrgForm.getUserIds(); @@ -95,14 +79,14 @@ UserOrganisation uo = (UserOrganisation) iter.next(); Integer userId = uo.getUser().getUserId(); if (userIdList.indexOf(userId.toString()) < 0) { - User user = (User) service.findById(User.class, userId); + User user = (User) userManagementService.findById(User.class, userId); Set userUos = user.getUserOrganisations(); userUos.remove(uo); user.setUserOrganisations(userUos); iter.remove(); log.debug("removed userId=" + userId + " from orgId=" + orgId); // remove from subgroups - service.deleteChildUserOrganisations(uo.getUser(), uo.getOrganisation()); + userManagementService.deleteChildUserOrganisations(uo.getUser(), uo.getOrganisation()); } } // add UserOrganisations that are in form data @@ -119,21 +103,21 @@ } } if (!alreadyInOrg) { - User user = (User) service.findById(User.class, userId); + User user = (User) userManagementService.findById(User.class, userId); UserOrganisation uo = new UserOrganisation(user, organisation); newUserOrganisations.add(uo); } } organisation.setUserOrganisations(uos); - service.save(organisation); + userManagementService.save(organisation); // if no new users, then finish; otherwise forward to where roles can be assigned for new users. if (newUserOrganisations.isEmpty()) { log.debug("no new users to add to orgId=" + orgId); return "redirect:/usermanage.do?org=" + orgId; } else { - request.setAttribute("roles", service.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN), + request.setAttribute("roles", userManagementService.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN), organisation.getOrganisationType())); request.setAttribute("newUserOrganisations", newUserOrganisations); request.setAttribute("orgId", orgId); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java =================================================================== diff -u -r7525e7b5fda723cc9c2c81a78cd8be3785bad851 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java (.../UserRolesController.java) (revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java (.../UserRolesController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.UserRolesForm; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationType; @@ -43,45 +42,33 @@ import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.validation.Errors; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; /** * @author jliew - * - * - * - * - * - * - * - * - * */ @Controller public class UserRolesController { - private static Logger log = Logger.getLogger(UserRolesController.class); - private static IUserManagementService service; - private static MessageService messageService; + + @Autowired + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; + private static List rolelist; - @Autowired - private WebApplicationContext applicationContext; - @RequestMapping("/userroles") public String execute(@ModelAttribute UserRolesForm userRolesForm, HttpServletRequest request, HttpServletResponse response) throws Exception { - - service = AdminServiceProxy.getService(applicationContext.getServletContext()); - messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); if (rolelist == null) { - rolelist = service.findAll(Role.class); + rolelist = userManagementService.findAll(Role.class); Collections.sort(rolelist); } @@ -114,19 +101,19 @@ log.debug("editing roles for userId: " + userId + " and orgId: " + orgId); // test requestor's permission - Organisation org = (Organisation) service.findById(Organisation.class, orgId); - User user = (User) service.findById(User.class, userId); + Organisation org = (Organisation) userManagementService.findById(Organisation.class, orgId); + User user = (User) userManagementService.findById(User.class, userId); OrganisationType orgType = org.getOrganisationType(); Integer orgIdOfCourse = (orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) ? org.getParentOrganisation().getOrganisationId() : orgId; Boolean isSysadmin = request.isUserInRole(Role.SYSADMIN); - User requestor = service.getUserByLogin(request.getRemoteUser()); - Integer rootOrgId = service.getRootOrganisation().getOrganisationId(); - Boolean requestorHasRole = service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_MANAGER) - || (service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_ADMIN) + User requestor = userManagementService.getUserByLogin(request.getRemoteUser()); + Integer rootOrgId = userManagementService.getRootOrganisation().getOrganisationId(); + Boolean requestorHasRole = userManagementService.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_MANAGER) + || (userManagementService.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_ADMIN) && !rootOrgId.equals(orgId)) - || (service.isUserGlobalGroupAdmin() && !rootOrgId.equals(orgId)); + || (userManagementService.isUserGlobalGroupAdmin() && !rootOrgId.equals(orgId)); if (!(requestorHasRole || isSysadmin)) { request.setAttribute("errorName", "UserRolesController"); @@ -137,18 +124,18 @@ userRolesForm.setUserId(userId); userRolesForm.setOrgId(org.getOrganisationId()); // screen display vars - request.setAttribute("rolelist", service.filterRoles(rolelist, isSysadmin, orgType)); + request.setAttribute("rolelist", userManagementService.filterRoles(rolelist, isSysadmin, orgType)); request.setAttribute("login", user.getLogin()); request.setAttribute("fullName", user.getFullName()); request.setAttribute("orgName", org.getName()); Organisation parentOrg = org.getParentOrganisation(); - if (parentOrg != null && !parentOrg.equals(service.getRootOrganisation())) { + if (parentOrg != null && !parentOrg.equals(userManagementService.getRootOrganisation())) { request.setAttribute("pOrgId", parentOrg.getOrganisationId()); request.setAttribute("parentName", parentOrg.getName()); } String[] roles = null; - UserOrganisation uo = service.getUserOrganisation(userId, orgId); + UserOrganisation uo = userManagementService.getUserOrganisation(userId, orgId); if (uo != null) { Iterator iter2 = uo.getUserOrganisationRoles().iterator(); roles = new String[uo.getUserOrganisationRoles().size()]; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java =================================================================== diff -u -rd11fc4c9bde6900c905c40030cb0f0c0ef659e9a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java (.../UserRolesSaveController.java) (revision d11fc4c9bde6900c905c40030cb0f0c0ef659e9a) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java (.../UserRolesSaveController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -31,54 +31,41 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.UserRolesForm; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * @author jliew - * - * - * - * - * - * - * - * - * - * */ @Controller public class UserRolesSaveController { - private static Logger log = Logger.getLogger(UserRolesSaveController.class); - private static IUserManagementService service; - private static MessageService messageService; + + @Autowired + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; + private static List rolelist; - @Autowired - private WebApplicationContext applicationContext; - @RequestMapping(path = "/userrolessave", method = RequestMethod.POST) public String execute(@ModelAttribute UserRolesForm userRolesForm, HttpServletRequest request, HttpServletResponse response) throws Exception { - - service = AdminServiceProxy.getService(applicationContext.getServletContext()); - messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); if (rolelist == null) { - rolelist = service.findAll(Role.class); + rolelist = userManagementService.findAll(Role.class); Collections.sort(rolelist); } @@ -89,8 +76,8 @@ request.setAttribute("org", orgId); log.debug("userId: " + userId + ", orgId: " + orgId + " will have " + roles.length + " roles"); - Organisation org = (Organisation) service.findById(Organisation.class, orgId); - User user = (User) service.findById(User.class, userId); + Organisation org = (Organisation) userManagementService.findById(Organisation.class, orgId); + User user = (User) userManagementService.findById(User.class, userId); MultiValueMap errorMap = new LinkedMultiValueMap<>(); @@ -99,13 +86,13 @@ errorMap.add("roles", messageService.getMessage("error.roles.empty")); request.setAttribute("errorMap", errorMap); request.setAttribute("rolelist", - service.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN), org.getOrganisationType())); + userManagementService.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN), org.getOrganisationType())); request.setAttribute("login", user.getLogin()); request.setAttribute("fullName", user.getFullName()); return "forward:/userroles.do"; } - service.setRolesForUserOrganisation(user, orgId, Arrays.asList(roles)); + userManagementService.setRolesForUserOrganisation(user, orgId, Arrays.asList(roles)); return "redirect:/usermanage.do?org=" + orgId; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java (.../UserSaveController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java (.../UserSaveController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -31,7 +31,6 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.form.UserForm; import org.lamsfoundation.lams.security.ISecurityService; import org.lamsfoundation.lams.themes.Theme; @@ -47,13 +46,13 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * @author Jun-Dir Liew @@ -62,24 +61,23 @@ @Controller @RequestMapping("/usersave") public class UserSaveController { - private static Logger log = Logger.getLogger(UserSaveController.class); - private static IUserManagementService service; - private static MessageService messageService; @Autowired - private WebApplicationContext applicationContext; + private ISecurityService securityService; + @Autowired + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping(path = "/saveUserDetails", method = RequestMethod.POST) public String saveUserDetails(@ModelAttribute UserForm userForm, HttpServletRequest request, HttpServletResponse response) throws Exception { - messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - UserSaveController.service = AdminServiceProxy.getService(applicationContext.getServletContext()); // action input Integer orgId = userForm.getOrgId(); Integer userId = userForm.getUserId(); - ISecurityService securityService = AdminServiceProxy.getSecurityService(applicationContext.getServletContext()); Integer loggeduserId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID(); // check if logged in User is Sysadmin @@ -89,14 +87,14 @@ } UserDTO sysadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); - UserSaveController.log.debug("orgId: " + orgId); + log.debug("orgId: " + orgId); Boolean edit = false; - SupportedLocale locale = (SupportedLocale) UserSaveController.service.findById(SupportedLocale.class, + SupportedLocale locale = (SupportedLocale) userManagementService.findById(SupportedLocale.class, userForm.getLocaleId()); - AuthenticationMethod authenticationMethod = (AuthenticationMethod) UserSaveController.service + AuthenticationMethod authenticationMethod = (AuthenticationMethod) userManagementService .findById(AuthenticationMethod.class, userForm.getAuthenticationMethodId()); - UserSaveController.log.debug("locale: " + locale); - UserSaveController.log.debug("authenticationMethod:" + authenticationMethod); + log.debug("locale: " + locale); + log.debug("authenticationMethod:" + authenticationMethod); if (request.getAttribute("CANCEL") != null) { if ((orgId == null) || (orgId == 0)) { @@ -108,7 +106,7 @@ User user = null; if (userId != null) { edit = true; - user = (User) UserSaveController.service.findById(User.class, userId); + user = (User) userManagementService.findById(User.class, userId); } MultiValueMap errorMap = new LinkedMultiValueMap<>(); @@ -120,7 +118,7 @@ errorMap.add("login", messageService.getMessage("error.username.invalid.characters")); } else { userForm.setLogin(login); - User existingUser = UserSaveController.service.getUserByLogin(login); + User existingUser = userManagementService.getUserByLogin(login); if (existingUser != null) { if ((user != null) && StringUtils.equals(user.getLogin(), login)) { // login exists - it's the user's current login @@ -157,17 +155,17 @@ if (errorMap.isEmpty()) { if (edit) { // edit user - UserSaveController.log.debug("editing userId: " + userId); + log.debug("editing userId: " + userId); // hash the new password if necessary, and audit the fact userForm.setPassword(user.getPassword()); BeanUtils.copyProperties(user, userForm); user.setLocale(locale); user.setAuthenticationMethod(authenticationMethod); - Theme cssTheme = (Theme) UserSaveController.service.findById(Theme.class, userForm.getUserTheme()); + Theme cssTheme = (Theme) userManagementService.findById(Theme.class, userForm.getUserTheme()); user.setTheme(cssTheme); - UserSaveController.service.saveUser(user); + userManagementService.saveUser(user); } else { // create user //password validation @@ -190,28 +188,28 @@ BeanUtils.copyProperties(user, userForm); user.setSalt(salt); user.setPassword(passwordHash); - UserSaveController.log.debug("creating user... new login: " + user.getLogin()); + log.debug("creating user... new login: " + user.getLogin()); if (errorMap.isEmpty()) { // TODO set theme according to user input // instead of server default. - user.setTheme(UserSaveController.service.getDefaultTheme()); + user.setTheme(userManagementService.getDefaultTheme()); user.setDisabledFlag(false); user.setCreateDate(new Date()); - user.setAuthenticationMethod((AuthenticationMethod) UserSaveController.service + user.setAuthenticationMethod((AuthenticationMethod) userManagementService .findByProperty(AuthenticationMethod.class, "authenticationMethodName", "LAMS-Database") .get(0)); user.setUserId(null); user.setLocale(locale); - Theme theme = (Theme) UserSaveController.service.findById(Theme.class, userForm.getUserTheme()); + Theme theme = (Theme) userManagementService.findById(Theme.class, userForm.getUserTheme()); user.setTheme(theme); - UserSaveController.service.saveUser(user); + userManagementService.saveUser(user); // make 'create user' audit log entry - UserSaveController.service.logUserCreated(user, sysadmin); + userManagementService.logUserCreated(user, sysadmin); - UserSaveController.log.debug("user: " + user.toString()); + log.debug("user: " + user.toString()); } } } @@ -240,10 +238,8 @@ public String changePass(@ModelAttribute UserForm userForm, HttpServletRequest request, HttpServletResponse response) throws Exception { - UserSaveController.service = AdminServiceProxy.getService(applicationContext.getServletContext()); Integer userId = WebUtil.readIntParam(request, "userId", true); userForm.setUserId(userId); - ISecurityService securityService = AdminServiceProxy.getSecurityService(applicationContext.getServletContext()); Integer loggeduserId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID(); // check if logged in User is Sysadmin @@ -269,12 +265,12 @@ } if (errorMap.isEmpty()) { - User user = (User) UserSaveController.service.findById(User.class, userId); + User user = (User) userManagementService.findById(User.class, userId); String salt = HashUtil.salt(); String passwordHash = HashUtil.sha256(password, salt); user.setSalt(salt); user.setPassword(passwordHash); - UserSaveController.service.saveUser(user); + userManagementService.saveUser(user); return "forward:/user/edit.do"; } request.setAttribute("errorMap", errorMap); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java =================================================================== diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java (.../UserSearchController.java) (revision 0aee88559b0d79e0516dd3630c24111361aeb787) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java (.../UserSearchController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -31,17 +31,16 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.WebApplicationContext; import org.springframework.web.util.HtmlUtils; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -50,26 +49,20 @@ /** * @author jliew - * - * - * - * */ @Controller public class UserSearchController { - private static Logger log = Logger.getLogger(UserSearchController.class); - private static IUserManagementService service; - private static MessageService messageService; - + @Autowired - private WebApplicationContext applicationContext; + private IUserManagementService userManagementService; + @Autowired + @Qualifier("adminMessageService") + private MessageService messageService; @RequestMapping("/usersearch") public String unspecified(HttpServletRequest request) throws Exception { - initServices(); - - if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) { + if (!(request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupAdmin())) { log.debug("user not sysadmin or global group admin"); request.setAttribute("errorName", "UserSearchAction authorisation"); @@ -87,8 +80,6 @@ @ResponseBody public String getPagedUsers(HttpServletRequest request, HttpServletResponse res) throws IOException, ServletException { - initServices(); - // the organisation type of the children String searchString = WebUtil.readStrParam(request, "fcol[1]", true); @@ -124,10 +115,10 @@ sortOrder = isSort5.equals(0) ? "ASC" : "DESC"; } - List userDtos = service.getAllUsers(page, size, sortBy, sortOrder, searchString); + List userDtos = userManagementService.getAllUsers(page, size, sortBy, sortOrder, searchString); ObjectNode responcedata = JsonNodeFactory.instance.objectNode(); - responcedata.put("total_rows", service.getCountUsers(searchString)); + responcedata.put("total_rows", userManagementService.getCountUsers(searchString)); ArrayNode rows = JsonNodeFactory.instance.arrayNode(); for (UserDTO userDto : userDtos) { @@ -150,13 +141,4 @@ return responcedata.toString(); } - private void initServices() { - if (service == null) { - service = AdminServiceProxy.getService(applicationContext.getServletContext()); - } - if (messageService == null) { - messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext()); - } - } - } \ No newline at end of file Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchSingleTermController.java =================================================================== diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchSingleTermController.java (.../UserSearchSingleTermController.java) (revision d4dec47dab74477560cfee18e74c7e4494bd1426) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchSingleTermController.java (.../UserSearchSingleTermController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -29,7 +29,6 @@ import javax.servlet.http.HttpSession; import org.apache.commons.lang.StringUtils; -import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.Role; @@ -42,35 +41,27 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; /** * @author jliew - * - * - * - * */ @Controller public class UserSearchSingleTermController { - private static IUserManagementService service; - @Autowired - private WebApplicationContext applicationContext; + private IUserManagementService userManagementService; @RequestMapping(path = "/user/searchsingle", method = RequestMethod.POST) public String execute(HttpServletRequest request) throws Exception { - UserSearchSingleTermController.service = AdminServiceProxy.getService(applicationContext.getServletContext()); String term = WebUtil.readStrParam(request, "term", true); Integer orgId = WebUtil.readIntParam(request, "orgId", true); if (StringUtils.isNotBlank(term)) { List users = new ArrayList(); if (orgId != null) { // filter results according to user's roles - Organisation org = (Organisation) UserSearchSingleTermController.service.findById(Organisation.class, + Organisation org = (Organisation) userManagementService.findById(Organisation.class, orgId); Organisation group; if (org != null) { @@ -85,27 +76,25 @@ group = org; } // get search results, filtered according to orgId - if (request.isUserInRole(Role.SYSADMIN) - || UserSearchSingleTermController.service.isUserGlobalGroupAdmin()) { - users = UserSearchSingleTermController.service.findUsers(term, orgId); - } else if (UserSearchSingleTermController.service.isUserInRole(userId, - group.getOrganisationId(), Role.GROUP_ADMIN) - || UserSearchSingleTermController.service.isUserInRole(userId, - group.getOrganisationId(), Role.GROUP_MANAGER)) { + if (request.isUserInRole(Role.SYSADMIN) || userManagementService.isUserGlobalGroupAdmin()) { + users = userManagementService.findUsers(term, orgId); + } else if (userManagementService.isUserInRole(userId, group.getOrganisationId(), + Role.GROUP_ADMIN) + || userManagementService.isUserInRole(userId, group.getOrganisationId(), + Role.GROUP_MANAGER)) { if (group.getCourseAdminCanBrowseAllUsers()) { - users = UserSearchSingleTermController.service.findUsers(term, orgId); + users = userManagementService.findUsers(term, orgId); } else if (org.getOrganisationType().getOrganisationTypeId() .equals(OrganisationType.CLASS_TYPE)) { - users = UserSearchSingleTermController.service.findUsers(term, - group.getOrganisationId(), orgId); + users = userManagementService.findUsers(term, group.getOrganisationId(), orgId); } } } } } } else { // if there's no orgId param, search all users - users = UserSearchSingleTermController.service.findUsers(term); + users = userManagementService.findUsers(term); } request.setAttribute("users", users); } Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java =================================================================== diff -u -rdca5a925b3daeb95e5c471749b006331f373b3b0 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision dca5a925b3daeb95e5c471749b006331f373b3b0) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -36,8 +36,6 @@ import javax.servlet.http.HttpSession; import org.apache.http.HttpException; -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.DefaultHttpClient; import org.apache.log4j.Logger; import org.lamsfoundation.lams.authoring.service.IAuthoringFullService; import org.lamsfoundation.lams.authoring.template.Option; @@ -58,7 +56,6 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -87,18 +84,13 @@ public static final String PARENT_ACTIVITY_TYPE = "parentActivityType"; // used to work out transitions - not used by the authoring module - private final HttpClient httpClient = new DefaultHttpClient(); - @Autowired - @Qualifier("lamsCoreToolService") protected ILamsCoreToolService lamsCoreToolService; @Autowired - @Qualifier("workspaceManagementService") protected IWorkspaceManagementService workspaceManagementService; @Autowired - protected IAuthoringFullService authoringFullService; + protected IAuthoringFullService authoringService; @Autowired - @Qualifier("toolDAO") protected IToolDAO toolDAO; protected static final String CONTENT_TYPE_JSON = "application/json;charset=utf-8"; @@ -313,7 +305,7 @@ private String createTitle(String templateCode, String userEnteredString, Integer workspaceFolderID) { String title = WebUtil.removeHTMLtags(userEnteredString); title = title.replaceAll("[@%<>/^/*/$]", ""); - title = authoringFullService.getUniqueNameForLearningDesign(title, workspaceFolderID); + title = authoringService.getUniqueNameForLearningDesign(title, workspaceFolderID); if (title.length() > 220) { title.substring(0, 220); } @@ -353,7 +345,7 @@ LearningDesign learningDesign = null; try { - learningDesign = authoringFullService.saveLearningDesignDetails(ldJSON); + learningDesign = authoringService.saveLearningDesignDetails(ldJSON); } catch (Exception e) { LdTemplateController.log.error("Unable to learning design with details " + ldJSON, e); throw new HttpException("Unable to learning design with details " + ldJSON); @@ -628,7 +620,7 @@ try { Tool tool = getTool(toolSignature); - Long toolContentID = authoringFullService.insertToolContentID(tool.getToolId()); + Long toolContentID = authoringService.insertToolContentID(tool.getToolId()); // Tools' services implement an interface for processing REST requests ToolRestManager toolRestService = (ToolRestManager) lamsCoreToolService.findToolService(tool); Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java =================================================================== diff -u -r671c0123933f9264962a7a2a9aba940ded111d57 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java (.../AuthoringController.java) (revision 671c0123933f9264962a7a2a9aba940ded111d57) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -81,7 +81,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.workspace.web.WorkspaceController; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -99,28 +98,21 @@ @Controller @RequestMapping("/authoring") public class AuthoringController { - private static Logger log = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("monitoringService") private IMonitoringService monitoringService; @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; @Autowired private ILamsToolService toolService; @Autowired - @Qualifier("authoringService") private IAuthoringFullService authoringService; @Autowired - @Qualifier("learningDesignService") private ILearningDesignService learningDesignService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @Autowired - @Qualifier("integrationService") private IIntegrationService integrationService; @Autowired WebApplicationContext applicationContext; Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentController.java (.../ImportToolContentController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentController.java (.../ImportToolContentController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -55,6 +55,7 @@ @Controller @RequestMapping("/authoring/importToolContent") public class ImportToolContentController { + private Logger log = Logger.getLogger(ImportToolContentController.class); public static final String EXPORT_TOOLCONTENT_SERVICE_BEAN_NAME = "exportToolContentService"; public static final String USER_SERVICE_BEAN_NAME = "userManagementService"; @@ -68,16 +69,11 @@ private static final String KEY_MSG_IMPORT_FILE_NOT_FOUND = "msg.import.file.not.found"; private static final String KEY_MSG_IMPORT_FAILED_UNKNOWN_REASON = "msg.import.failed.unknown.reason"; - private Logger log = Logger.getLogger(ImportToolContentController.class); - @Autowired - @Qualifier("userManagementService") IUserManagementService userManagementService; @Autowired - @Qualifier("exportToolContentService") IExportToolContentService exportToolContentService; @Autowired - @Qualifier("authoringMessageService") MessageService authoringMessageService; @RequestMapping("/import") Index: lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentController.java =================================================================== diff -u -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentController.java (.../CommentController.java) (revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a) +++ lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentController.java (.../CommentController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -65,20 +65,15 @@ @Controller @RequestMapping("/comments") public class CommentController { - private static Logger log = Logger.getLogger(CommentController.class); @Autowired - @Qualifier("userManagementService") - private IUserManagementService userService; + private IUserManagementService userManagementService; @Autowired - @Qualifier("commentService") private ICommentService commentService; @Autowired - @Qualifier("lamsCoreToolService") - private ILamsCoreToolService coreToolService; + private ILamsCoreToolService lamsCoreToolService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; /** @@ -183,15 +178,15 @@ } private boolean learnerInToolSession(Long toolSessionId, User user) { - GroupedToolSession toolSession = (GroupedToolSession) coreToolService.getToolSessionById(toolSessionId); + GroupedToolSession toolSession = (GroupedToolSession) lamsCoreToolService.getToolSessionById(toolSessionId); return toolSession.getSessionGroup().getUsers().contains(user); } private boolean monitorInToolSession(Long toolSessionId, User user, SessionMap sessionMap) { if (ToolAccessMode.TEACHER .equals(WebUtil.getToolAccessMode((String) sessionMap.get(AttributeNames.ATTR_MODE)))) { - GroupedToolSession toolSession = (GroupedToolSession) coreToolService.getToolSessionById(toolSessionId); + GroupedToolSession toolSession = (GroupedToolSession) lamsCoreToolService.getToolSessionById(toolSessionId); return securityService.isLessonMonitor(toolSession.getLesson().getLessonId(), user.getUserId(), "Comment Monitoring Tasks", false); } else { @@ -660,7 +655,7 @@ */ private User getCurrentUser(HttpServletRequest request) { UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); - return userService.getUserByLogin(user.getLogin()); + return userManagementService.getUserByLogin(user.getLogin()); } } \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java (.../DisplayGroupController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java (.../DisplayGroupController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -56,7 +56,6 @@ import org.lamsfoundation.lams.util.IndexUtils; import org.lamsfoundation.lams.util.WebUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -67,19 +66,14 @@ @RequestMapping("/displayGroup") public class DisplayGroupController { @Autowired - @Qualifier("userManagementService") - private IUserManagementService userService; + private IUserManagementService userManagementService; @Autowired - @Qualifier("lessonService") private LessonService lessonService; @Autowired - @Qualifier("learningDesignService") private ILearningDesignService learningDesignService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @Autowired - @Qualifier("learnerService") private ILearnerService learnerService; @RequestMapping("") @@ -90,7 +84,7 @@ Organisation org = null; if (orgId != null) { - org = (Organisation) userService.findById(Organisation.class, orgId); + org = (Organisation) userManagementService.findById(Organisation.class, orgId); } if (org != null) { @@ -103,7 +97,7 @@ } List roles = new ArrayList<>(); - List userOrganisationRoles = userService.getUserOrganisationRoles(orgId, + List userOrganisationRoles = userManagementService.getUserOrganisationRoles(orgId, request.getRemoteUser()); for (UserOrganisationRole userOrganisationRole : userOrganisationRoles) { Integer roleId = userOrganisationRole.getRole().getRoleId(); @@ -120,7 +114,7 @@ } //set whether organisation is favorite - boolean isFavorite = userService.isOrganisationFavorite(orgId, user.getUserId()); + boolean isFavorite = userManagementService.isOrganisationFavorite(orgId, user.getUserId()); iob.setFavorite(isFavorite); } @@ -257,7 +251,7 @@ for (Organisation organisation : children) { if (OrganisationState.ACTIVE.equals(organisation.getOrganisationState().getOrganisationStateId())) { List classRoles = new ArrayList<>(); - List userOrganisationRoles = userService + List userOrganisationRoles = userManagementService .getUserOrganisationRoles(organisation.getOrganisationId(), username); // don't list the subgroup if user is not a member, and not a group admin/manager if (((userOrganisationRoles == null) || userOrganisationRoles.isEmpty()) && !isSysAdmin @@ -363,6 +357,6 @@ } private User getUser(String login) { - return (User) userService.findByProperty(User.class, "login", login).get(0); + return (User) userManagementService.findByProperty(User.class, "login", login).get(0); } } Index: lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java =================================================================== diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java (.../EmailUserController.java) (revision 0e9eca8da006863730e793b75a47803bc6142c67) +++ lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java (.../EmailUserController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -59,14 +59,12 @@ @Controller @RequestMapping("/emailUser") public class EmailUserController { - private static Logger log = Logger.getLogger(EmailUserController.class); private static final EmailValidator emailValidator = EmailValidator.getInstance(); + @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; @Autowired - @Qualifier("eventNotificationService") private IEventNotificationService eventNotificationService; @Autowired @Qualifier("centralMessageService") Index: lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsController.java =================================================================== diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsController.java (.../FindUserLessonsController.java) (revision 0e9eca8da006863730e793b75a47803bc6142c67) +++ lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsController.java (.../FindUserLessonsController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -22,7 +22,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -32,24 +31,16 @@ import com.fasterxml.jackson.databind.node.ObjectNode; /** - * * @author asukkar - * - * - * - * */ @Controller @RequestMapping("/findUserLessons") public class FindUserLessonsController { @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; @Autowired - @Qualifier("lessonService") private ILessonService lessonService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @RequestMapping("/getResults") Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java =================================================================== diff -u -ra127989b08183726fcbb9956721eff6553c4a0eb -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java (.../HomeController.java) (revision a127989b08183726fcbb9956721eff6553c4a0eb) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java (.../HomeController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -64,7 +64,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -80,25 +79,19 @@ @Controller @RequestMapping("/home") public class HomeController { - private static Logger log = Logger.getLogger(HomeController.class); @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; @Autowired - @Qualifier("lessonService") private ILessonService lessonService; @Autowired - @Qualifier("learningDesignService") private ILearningDesignService learningDesignService; @Autowired private IGroupUserDAO groupUserDAO; @Autowired - @Qualifier("workspaceManagementService") private IWorkspaceManagementService workspaceManagementService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @Autowired WebApplicationContext applicationcontext; Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java =================================================================== diff -u -r8d8232ae7142c30068360a2a41bbcccc065e775b -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java (.../IndexController.java) (revision 8d8232ae7142c30068360a2a41bbcccc065e775b) +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java (.../IndexController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -50,7 +50,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -67,18 +66,14 @@ @Controller @RequestMapping("/index") public class IndexController { - + private static Logger log = Logger.getLogger(IndexController.class); private static final String PATH_LAMS_PLANNER_WAR = "lams-planner.war"; - private static Logger log = Logger.getLogger(IndexController.class); @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; @Autowired - @Qualifier("integrationService") private IIntegrationService integrationService; @Autowired - @Qualifier("policyService") private IPolicyService policyService; @RequestMapping("") Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java =================================================================== diff -u -r33829c670fd8c90447d62ea3300498a103905e7a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java (.../LAMSConnectorServlet.java) (revision 33829c670fd8c90447d62ea3300498a103905e7a) +++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java (.../LAMSConnectorServlet.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -46,10 +46,9 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.util.FileCopyUtils; -import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.SpringBeanAutowiringSupport; -import org.springframework.web.context.support.WebApplicationContextUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -86,6 +85,7 @@ private String lamsContextPath; @Autowired + @Qualifier("centralMessageService") private MessageService centralMessageService; /* Index: lams_central/src/java/org/lamsfoundation/lams/web/LessonConditionsController.java =================================================================== diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/LessonConditionsController.java (.../LessonConditionsController.java) (revision 0e9eca8da006863730e793b75a47803bc6142c67) +++ lams_central/src/java/org/lamsfoundation/lams/web/LessonConditionsController.java (.../LessonConditionsController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -65,9 +65,6 @@ * This Action takes care of operations on lesson conditional release based on preceding lesson completion. * * @author Marcin Cieslak - * - * - * */ @Controller @RequestMapping("/lessonConditions") @@ -84,20 +81,16 @@ private static final String PARAM_INDIVIDUAL_FINISH = "lessonIndividualFinish"; @Autowired - @Qualifier("lessonService") private ILessonService lessonService; @Autowired - @Qualifier("monitoringService") private IMonitoringService monitoringService; @Autowired - @Qualifier("groupUserDAO") private IGroupUserDAO groupUserDAO; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @Autowired @Qualifier("centralMessageService") - private MessageService messageservice; + private MessageService messageService; /** * Prepares data for thickbox displayed on Index page. @@ -300,7 +293,7 @@ } catch (Exception e) { LessonConditionsController.logger.error(e); errorMap.add("GLOBAL", - messageservice.getMessage("error.conditions.box.finish.date", new Object[] { e.getMessage() })); + messageService.getMessage("error.conditions.box.finish.date", new Object[] { e.getMessage() })); } if (!errorMap.isEmpty()) { Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java =================================================================== diff -u -r8d8232ae7142c30068360a2a41bbcccc065e775b -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java (.../LoginAsController.java) (revision 8d8232ae7142c30068360a2a41bbcccc065e775b) +++ lams_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java (.../LoginAsController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -43,37 +43,33 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; /** * @author jliew - * - * - * */ @Controller public class LoginAsController { - + @Autowired - WebApplicationContext applicationContext; + @Qualifier("centralMessageService") + private MessageService messageService; + @Autowired + private IntegrationService integrationService; + @Autowired + private ILogEventService logEventService; + @Autowired + private IUserManagementService userManagementService; @RequestMapping("/loginas") public String execute(HttpServletRequest request) throws Exception { - - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - IUserManagementService service = (IUserManagementService) ctx.getBean("userManagementService"); - MessageService messageService = (MessageService) ctx.getBean("centralMessageService"); - IntegrationService integrationService = (IntegrationService) ctx.getBean("integrationService"); - String login = WebUtil.readStrParam(request, "login", false); - if (service.isUserSysAdmin()) { + if (userManagementService.isUserSysAdmin()) { if ((login != null) && (login.trim().length() > 0)) { - User user = service.getUserByLogin(login); + User user = userManagementService.getUserByLogin(login); if (user != null) { // If the user is an integration learner and ALLOW_DIRECT_ACCESS_FOR_INTEGRATION_LEARNERS if off do not let syadmin log in @@ -82,7 +78,7 @@ .getAsBoolean(ConfigurationKeys.ALLOW_DIRECT_ACCESS_FOR_INTEGRATION_LEARNERS); if (!allowDirectAccessIntegrationLearner) { boolean isIntegrationUser = integrationService.isIntegrationUser(user.getUserId()); - if (isIntegrationUser && isOnlyLearner(service, user.getUserId())) { + if (isIntegrationUser && isOnlyLearner(user.getUserId())) { request.setAttribute("errorName", "Login As"); request.setAttribute("errorMessage", messageService.getMessage("error.cannot.login.as.with.not.allow.direct.access")); @@ -92,7 +88,6 @@ // audit log when loginas UserDTO sysadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); - ILogEventService logEventService = (ILogEventService) ctx.getBean("logEventService"); String[] args = new String[] { sysadmin.getLogin() + " (" + sysadmin.getUserID() + ")", login }; String message = messageService.getMessage("audit.admin.loginas", args); logEventService.logEvent(LogEvent.TYPE_LOGIN_AS, sysadmin.getUserID(), user.getUserId(), null, null, @@ -118,8 +113,8 @@ return "forward:/admin/usersearch.do"; } - private boolean isOnlyLearner(IUserManagementService service, Integer userId) { - Map> orgRoleSets = service.getRolesForUser(userId); + private boolean isOnlyLearner(Integer userId) { + Map> orgRoleSets = userManagementService.getRolesForUser(userId); for (Set orgRoleSet : orgRoleSets.values()) { for (Integer role : orgRoleSet) { if (role.equals(Role.ROLE_AUTHOR) || role.equals(Role.ROLE_MONITOR) Index: lams_central/src/java/org/lamsfoundation/lams/web/NotificationController.java =================================================================== diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/NotificationController.java (.../NotificationController.java) (revision 792f30e164500b758d9eeac2dcf19853be4dfd9f) +++ lams_central/src/java/org/lamsfoundation/lams/web/NotificationController.java (.../NotificationController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -38,7 +38,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -49,15 +48,12 @@ /** * Processes notification sent from Tools to users. - * - * */ @Controller @RequestMapping("//notification") public class NotificationController { @Autowired - @Qualifier("eventNotificationService") private IEventNotificationService eventNotificationService; @ResponseBody Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java (.../OrganisationGroupController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java (.../OrganisationGroupController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -68,7 +68,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -83,27 +82,21 @@ @Controller @RequestMapping("/OrganisationGroup") public class OrganisationGroupController { - private static Logger log = Logger.getLogger(OrganisationGroupController.class); + private static final String PARAM_USED_FOR_BRANCHING = "usedForBranching"; + @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; @Autowired - @Qualifier("learnerService") private ILearnerService learnerService; @Autowired - @Qualifier("lessonService") private ILessonService lessonService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @Autowired - @Qualifier("integrationService") private IIntegrationService integrationService; - private static final String PARAM_USED_FOR_BRANCHING = "usedForBranching"; - /** * Shows course grouping list or redirects to groups if a grouping was already chosen. * Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java =================================================================== diff -u -r71809a5526cd51317de36a6aeb03235579a446a5 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java (.../PasswordChangeController.java) (revision 71809a5526cd51317de36a6aeb03235579a446a5) +++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeController.java (.../PasswordChangeController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -29,6 +29,7 @@ import org.lamsfoundation.lams.logevent.LogEvent; import org.lamsfoundation.lams.logevent.service.ILogEventService; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.usermanagement.service.UserManagementService; import org.lamsfoundation.lams.util.HashUtil; import org.lamsfoundation.lams.util.MessageService; @@ -54,9 +55,11 @@ @Autowired @Qualifier("centralMessageService") - MessageService messageService; + private MessageService messageService; @Autowired - WebApplicationContext applicationContext; + private ILogEventService logEventService; + @Autowired + private IUserManagementService userManagementService; /** * @param mapping @@ -86,14 +89,9 @@ if ((loggedInUser == null) || !loggedInUser.equals(login)) { errorMap.add("GLOBAL", messageService.getMessage("error.authorisation")); + } else { - // WebApplicationContext ctx = - // WebApplicationContextUtils.getWebApplicationContext(request.getSession(true).getServletContext()); - WebApplicationContext ctx = WebApplicationContextUtils - .getWebApplicationContext(applicationContext.getServletContext()); - UserManagementService service = (UserManagementService) ctx.getBean("userManagementService"); - - User user = service.getUserByLogin(login); + User user = userManagementService.getUserByLogin(login); String passwordHash = user.getPassword().length() == HashUtil.SHA1_HEX_LENGTH ? HashUtil.sha1(oldPassword) : HashUtil.sha256(oldPassword, user.getSalt()); @@ -120,11 +118,9 @@ user.setSalt(salt); user.setPassword(HashUtil.sha256(password, salt)); user.setChangePassword(false); - service.saveUser(user); + userManagementService.saveUser(user); // make 'password changed' audit log entry - ILogEventService logEventService = (ILogEventService) ctx.getBean("logEventService"); - MessageService messageService = (MessageService) ctx.getBean("centralMessageService"); String[] args = new String[1]; args[0] = user.getLogin() + " (" + user.getUserId() + ")"; String message = messageService.getMessage("audit.user.password.change", args); Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java =================================================================== diff -u -r72423762cd6df6a5f3887e5eace884eb7d4ca577 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java (.../PortraitController.java) (revision 72423762cd6df6a5f3887e5eace884eb7d4ca577) +++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java (.../PortraitController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -28,7 +28,6 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -38,17 +37,15 @@ */ @Controller public class PortraitController { - private static Logger log = Logger.getLogger(PortraitController.class); @Autowired - @Qualifier("userManagementService") - private IUserManagementService service; + private IUserManagementService userManagementService; @RequestMapping("/portrait") public String execute(@ModelAttribute("PortraitActionForm") PortraitActionForm portraitForm, HttpServletRequest request) throws Exception { - Long portraitUuid = service.getUserByLogin(request.getRemoteUser()).getPortraitUuid(); + Long portraitUuid = userManagementService.getUserByLogin(request.getRemoteUser()).getPortraitUuid(); log.debug("using portraitUuid=" + portraitUuid); // if no portrait has been uploaded, set the uuid to 0 portraitForm.setPortraitUuid(portraitUuid == null ? 0 : portraitUuid); Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java =================================================================== diff -u -r8d8232ae7142c30068360a2a41bbcccc065e775b -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java (.../PortraitSaveController.java) (revision 8d8232ae7142c30068360a2a41bbcccc065e775b) +++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java (.../PortraitSaveController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -54,7 +54,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; import org.springframework.web.multipart.MultipartFile; /** @@ -64,23 +63,18 @@ @Controller @RequestMapping(path = "/saveportrait", method = RequestMethod.POST) public class PortraitSaveController { - private static Logger log = Logger.getLogger(PortraitSaveController.class); + private static final String PORTRAIT_DELETE_AUDIT_KEY = "audit.delete.portrait"; + @Autowired - @Qualifier("userManagementService") - private IUserManagementService service; + private IUserManagementService userManagementService; @Autowired - @Qualifier("logEventService") private ILogEventService logEventService; @Autowired @Qualifier("centralMessageService") private MessageService messageService; @Autowired - WebApplicationContext applicationContext; - @Autowired - @Qualifier("centralToolContentHandler") private IToolContentHandler centralToolContentHandler; - private static final String PORTRAIT_DELETE_AUDIT_KEY = "audit.delete.portrait"; /** * Upload portrait image. @@ -95,7 +89,7 @@ String fileName = file.getOriginalFilename(); log.debug("got file: " + fileName + " of type: " + file.getContentType() + " with size: " + file.getSize()); - User user = service.getUserByLogin(request.getRemoteUser()); + User user = userManagementService.getUserByLogin(request.getRemoteUser()); // check if file is an image using the MIME content type String mediaType = file.getContentType().split("/", 2)[0]; @@ -163,7 +157,7 @@ centralToolContentHandler.deleteFile(user.getPortraitUuid()); } user.setPortraitUuid(originalFileNode.getUuid()); - service.saveUser(user); + userManagementService.saveUser(user); return "forward:/index.do?redirect=portrait"; } @@ -182,7 +176,7 @@ } String responseValue = "deleted"; - User userToModify = (User) service.findById(User.class, userId); + User userToModify = (User) userManagementService.findById(User.class, userId); if (userToModify != null && userToModify.getPortraitUuid() != null) { UserDTO sysadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); @@ -195,7 +189,7 @@ try { centralToolContentHandler.deleteFile(userToModify.getPortraitUuid()); userToModify.setPortraitUuid(null); - service.saveUser(userToModify); + userManagementService.saveUser(userToModify); } catch (Exception e) { log.error("Unable to delete a portrait for user " + userId + ".", e); return deleteResponse(response, "error"); Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java =================================================================== diff -u -r72423762cd6df6a5f3887e5eace884eb7d4ca577 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java (.../ProfileController.java) (revision 72423762cd6df6a5f3887e5eace884eb7d4ca577) +++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java (.../ProfileController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -75,34 +75,28 @@ @Controller @RequestMapping("/profile") public class ProfileController { - private static Logger log = Logger.getLogger(ProfileController.class); @Autowired - @Qualifier("userManagementService") - private IUserManagementService service; - - private static List locales; + private IUserManagementService userManagementService; @Autowired - @Qualifier("learnerService") private ILearnerService learnerService; @Autowired - @Qualifier("themeService") private IThemeService themeService; @Autowired - @Qualifier("timezoneService") private ITimezoneService timezoneService; @Autowired @Qualifier("centralMessageService") private MessageService messageService; @Autowired - @Qualifier("policyService") private IPolicyService policyService; + + private static List locales; @RequestMapping("/view") public String view(HttpServletRequest request) throws Exception { - User requestor = service.getUserByLogin(request.getRemoteUser()); + User requestor = userManagementService.getUserByLogin(request.getRemoteUser()); String fullName = (requestor.getTitle() != null ? requestor.getTitle() + " " : "") + requestor.getFirstName() + " " + requestor.getLastName(); String email = requestor.getEmail(); @@ -118,14 +112,14 @@ public String lessons(HttpServletRequest request) throws Exception { // list all active lessons for this learner (single sql query) - User requestor = service.getUserByLogin(request.getRemoteUser()); + User requestor = userManagementService.getUserByLogin(request.getRemoteUser()); LessonDTO[] lessons = learnerService.getActiveLessonsFor(requestor.getUserId()); // make org-sorted beans out of the lessons HashMap orgBeansMap = new HashMap<>(); for (LessonDTO lesson : lessons) { Integer orgId = lesson.getOrganisationID(); - Organisation org = (Organisation) service.findById(Organisation.class, orgId); + Organisation org = (Organisation) userManagementService.findById(Organisation.class, orgId); Integer orgTypeId = org.getOrganisationType().getOrganisationTypeId(); IndexLessonBean lessonBean = new IndexLessonBean(lesson.getLessonName(), "javascript:openLearner(" + lesson.getLessonID() + ")"); @@ -176,7 +170,7 @@ // sort lessons inside each org bean for (Object o : beans) { IndexOrgBean bean = (IndexOrgBean) o; - Organisation org = (Organisation) service.findById(Organisation.class, bean.getId()); + Organisation org = (Organisation) userManagementService.findById(Organisation.class, bean.getId()); // put lesson beans into id-indexed map HashMap map = new HashMap<>(); @@ -238,15 +232,15 @@ ; } - User requestor = service.getUserByLogin(request.getRemoteUser()); + User requestor = userManagementService.getUserByLogin(request.getRemoteUser()); BeanUtils.copyProperties(userForm, requestor); SupportedLocale locale = requestor.getLocale(); if (locale == null) { locale = LanguageUtil.getDefaultLocale(); } userForm.setLocaleId(locale.getLocaleId()); if (locales == null) { - locales = service.findAll(SupportedLocale.class); + locales = userManagementService.findAll(SupportedLocale.class); } request.setAttribute("locales", locales); request.setAttribute("countryCodes", LanguageUtil.getCountryCodes(false)); Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java =================================================================== diff -u -r88b8e837ea5c4e4a87cb26087c5c8aaf4c225d97 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java (.../ProfileSaveController.java) (revision 88b8e837ea5c4e4a87cb26087c5c8aaf4c225d97) +++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveController.java (.../ProfileSaveController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -52,11 +52,10 @@ */ @Controller public class ProfileSaveController { - private static Logger log = Logger.getLogger(ProfileSaveController.class); + @Autowired - @Qualifier("userManagementService") - private IUserManagementService service; + private IUserManagementService userManagementService; @Autowired @Qualifier("centralMessageService") private MessageService messageService; @@ -73,7 +72,7 @@ request.setAttribute("submitted", true); - User requestor = service.getUserByLogin(request.getRemoteUser()); + User requestor = userManagementService.getUserByLogin(request.getRemoteUser()); // check requestor is same as user being edited if (!requestor.getLogin().equals(userForm.getLogin())) { @@ -131,14 +130,14 @@ } else { // update all fields BeanUtils.copyProperties(requestor, userForm); - SupportedLocale locale = (SupportedLocale) service.findById(SupportedLocale.class, userForm.getLocaleId()); + SupportedLocale locale = (SupportedLocale) userManagementService.findById(SupportedLocale.class, userForm.getLocaleId()); requestor.setLocale(locale); - Theme cssTheme = (Theme) service.findById(Theme.class, userForm.getUserTheme()); + Theme cssTheme = (Theme) userManagementService.findById(Theme.class, userForm.getUserTheme()); requestor.setTheme(cssTheme); } - service.saveUser(requestor); + userManagementService.saveUser(requestor); // replace UserDTO in the shared session HttpSession ss = SessionManager.getSession(); Index: lams_central/src/java/org/lamsfoundation/lams/web/RedirectController.java =================================================================== diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/RedirectController.java (.../RedirectController.java) (revision 792f30e164500b758d9eeac2dcf19853be4dfd9f) +++ lams_central/src/java/org/lamsfoundation/lams/web/RedirectController.java (.../RedirectController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -41,40 +41,33 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; /** - * @author lfoxton + * This action is used for notification emails. It is designed to enable direct linking to either monitor or + * learner so that links can be sent in the email. This must be done through LAMS central so it correctly + * redirects the user to the login page (if they have no session) before returning them to the correct location. * - * This action is used for notification emails. It is designed to enable direct linking to either monitor or - * learner so that links can be sent in the email. This must be done through LAMS central so it correctly - * redirects the user to the login page (if they have no session) before returning them to the correct location. + * This action takes one parameter "h" which is a Base64 hash of a comma-separated value (relativeUrlPath, + * toolSessionID, accessMode) where: relativeUrlPath = Relative path to resource eg /tool/lawiki10/learner.do + * toolSessionID = A valid tool session ID for the lesson accessMode = l or t (learner or teacher) * - * This action takes one parameter "h" which is a Base64 hash of a comma-separated value (relativeUrlPath, - * toolSessionID, accessMode) where: relativeUrlPath = Relative path to resource eg /tool/lawiki10/learner.do - * toolSessionID = A valid tool session ID for the lesson accessMode = l or t (learner or teacher) + * The parameters are hashed to prevent people from identifying the url, and attempting to access content to + * which they are unauthorised, see LDEV-1978 * - * The parameters are hashed to prevent people from identifying the url, and attempting to access content to - * which they are unauthorised, see LDEV-1978 + * The toolSessionID and accessMode are used to determine the permissions of this user so it someone forwards + * the email to an unauthorised user, they still cannot access the link unless they are part of the correct + * group. These checks may become unneccessary on the completion of LDEV-1978 * - * The toolSessionID and accessMode are used to determine the permissions of this user so it someone forwards - * the email to an unauthorised user, they still cannot access the link unless they are part of the correct - * group. These checks may become unneccessary on the completion of LDEV-1978 - * - * Note that parameter names have been made as short as possible here to attempt to shorten the entire link - * required, and hopefully prevent email clients cutting them off and making a newline which sometimes breaks - * links. - * - * - * - * - * + * Note that parameter names have been made as short as possible here to attempt to shorten the entire link + * required, and hopefully prevent email clients cutting them off and making a newline which sometimes breaks + * links. + * + * @author lfoxton */ @Controller public class RedirectController { - private static Logger log = Logger.getLogger(RedirectController.class); public static final String PARAM_HASH = "h"; @@ -83,11 +76,9 @@ public static final String ACCESS_MODE_LEARNER = "l"; @Autowired - @Qualifier("lamsToolService") private ILamsToolService lamsToolService; @Autowired - @Qualifier("userManagementService") - private IUserManagementService userService; + private IUserManagementService userManagementService; @RequestMapping("/r") public String execute(HttpServletRequest req, HttpServletResponse res) throws Exception { @@ -175,7 +166,7 @@ } private User getRealUser(UserDTO dto) { - return userService.getUserByLogin(dto.getLogin()); + return userManagementService.getUserByLogin(dto.getLogin()); } private ToolSession getToolSession(Long toolSessionID) { Index: lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java (.../LtiController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java (.../LtiController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -30,7 +30,6 @@ import org.lamsfoundation.lams.integration.service.IIntegrationService; import org.lamsfoundation.lams.integration.util.LoginRequestDispatcher; import org.lamsfoundation.lams.integration.util.LtiUtils; -import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.dto.LearnerProgressDTO; @@ -49,7 +48,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -70,25 +68,16 @@ private static Logger log = Logger.getLogger(LtiController.class); @Autowired - @Qualifier("integrationService") private IIntegrationService integrationService; @Autowired - @Qualifier("monitoringService") private IMonitoringService monitoringService; @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; @Autowired - @Qualifier("learningDesignService") - private ILearningDesignService learningDesignService; - @Autowired - @Qualifier("lessonService") private ILessonService lessonService; @Autowired - @Qualifier("workspaceManagementService") private IWorkspaceManagementService workspaceManagementService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; /** Index: lams_central/src/java/org/lamsfoundation/lams/web/controller/PolicyConsentsController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/controller/PolicyConsentsController.java (.../PolicyConsentsController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_central/src/java/org/lamsfoundation/lams/web/controller/PolicyConsentsController.java (.../PolicyConsentsController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -27,11 +27,9 @@ @RequestMapping("policyConsents") public class PolicyConsentsController { @Autowired - @Qualifier("policyService") - private IPolicyService policyService = null; + private IPolicyService policyService; @Autowired - @Qualifier("userManagementService") - private IUserManagementService userManagementService = null; + private IUserManagementService userManagementService; @RequestMapping("") public String execute(HttpServletRequest request) throws Exception { Index: lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java =================================================================== diff -u -re952488de6475350bc2fab3272b5350b3a7a6d51 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java (.../SignupController.java) (revision e952488de6475350bc2fab3272b5350b3a7a6d51) +++ lams_central/src/java/org/lamsfoundation/lams/web/controller/SignupController.java (.../SignupController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -35,16 +35,14 @@ @Controller @RequestMapping("/signup") public class SignupController { - private static Logger log = Logger.getLogger(SignupController.class); + @Autowired - @Qualifier("signupService") private ISignupService signupService; @Autowired @Qualifier("centralMessageService") - MessageService messageService; + private MessageService messageService; @Autowired - @Qualifier("timezoneService") private ITimezoneService timezoneService ; @RequestMapping("init") Index: lams_central/src/java/org/lamsfoundation/lams/web/controller/TwoFactorAuthenticationController.java =================================================================== diff -u -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/controller/TwoFactorAuthenticationController.java (.../TwoFactorAuthenticationController.java) (revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a) +++ lams_central/src/java/org/lamsfoundation/lams/web/controller/TwoFactorAuthenticationController.java (.../TwoFactorAuthenticationController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -26,12 +26,10 @@ import javax.servlet.http.HttpServletRequest; import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.usermanagement.service.UserManagementService; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; import com.warrenstrange.googleauth.GoogleAuthenticator; import com.warrenstrange.googleauth.GoogleAuthenticatorKey; @@ -44,15 +42,11 @@ public class TwoFactorAuthenticationController { @Autowired - WebApplicationContext applicationContext; + private IUserManagementService userManagementService; @RequestMapping("/twoFactorAuthentication") public String execute(HttpServletRequest request) throws Exception { - WebApplicationContext ctx = WebApplicationContextUtils - .getWebApplicationContext(applicationContext.getServletContext()); - UserManagementService userManagementService = (UserManagementService) ctx.getBean("userManagementService"); - // check if user needs to get his shared two-factor authorization secret User loggedInUser = userManagementService.getUserByLogin(request.getRemoteUser()); if (loggedInUser.isTwoFactorAuthenticationEnabled() Index: lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java =================================================================== diff -u -r46128a2504605c123506f733ee24dfed6d97a893 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java (.../OutcomeController.java) (revision 46128a2504605c123506f733ee24dfed6d97a893) +++ lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java (.../OutcomeController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -75,17 +75,13 @@ @Controller @RequestMapping("/outcome") public class OutcomeController { - private static Logger log = Logger.getLogger(OutcomeController.class); @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @Autowired - @Qualifier("outcomeService") private IOutcomeService outcomeService; @Autowired @Qualifier("centralMessageService") Index: lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServlet.java =================================================================== diff -u -r33829c670fd8c90447d62ea3300498a103905e7a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServlet.java (.../RegisterServlet.java) (revision 33829c670fd8c90447d62ea3300498a103905e7a) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterServlet.java (.../RegisterServlet.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -73,7 +73,6 @@ import org.lamsfoundation.lams.util.MessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.context.support.SpringBeanAutowiringSupport; -import org.springframework.web.context.support.WebApplicationContextUtils; /** * @author Andrey Balan Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java =================================================================== diff -u -r33829c670fd8c90447d62ea3300498a103905e7a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision 33829c670fd8c90447d62ea3300498a103905e7a) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -989,12 +989,6 @@ ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(extServer, userMap, courseId, null, method); - if (lessonService == null) { - lessonService = (ILessonService) WebApplicationContextUtils - .getRequiredWebApplicationContext(request.getSession().getServletContext()) - .getBean("lessonService"); - } - User user = userMap.getUser(); if (user == null) { String error = "Unable to add user to lesson class as user is missing from the user map"; Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/NotificationServlet.java =================================================================== diff -u -r33829c670fd8c90447d62ea3300498a103905e7a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/NotificationServlet.java (.../NotificationServlet.java) (revision 33829c670fd8c90447d62ea3300498a103905e7a) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/NotificationServlet.java (.../NotificationServlet.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -5,6 +5,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -25,7 +26,7 @@ import org.lamsfoundation.lams.util.CentralConstants; import org.lamsfoundation.lams.util.WebUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.context.support.WebApplicationContextUtils; +import org.springframework.web.context.support.SpringBeanAutowiringSupport; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.ls.DOMImplementationLS; @@ -87,16 +88,14 @@ doGet(request, response); } - /** - * Initialization of the servlet.
+ /* + * Request Spring to lookup the applicationContext tied to the current ServletContext and inject service beans + * available in that applicationContext. */ @Override - public void init() throws ServletException { - integrationService = (IntegrationService) WebApplicationContextUtils - .getRequiredWebApplicationContext(getServletContext()).getBean("integrationService"); - - eventNotificationService = (IEventNotificationService) WebApplicationContextUtils - .getRequiredWebApplicationContext(getServletContext()).getBean("eventNotificationService"); + public void init(ServletConfig config) throws ServletException { + super.init(config); + SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this, config.getServletContext()); } private void getNotifications(Integer userId, HttpServletRequest request, HttpServletResponse response) Index: lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java =================================================================== diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java (.../WorkspaceController.java) (revision 792f30e164500b758d9eeac2dcf19853be4dfd9f) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java (.../WorkspaceController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -49,19 +49,12 @@ /** * @author Manpreet Minhas - * - * */ @Controller @RequestMapping("/workspace") public class WorkspaceController { - protected Logger log = Logger.getLogger(WorkspaceController.class.getName()); - @Autowired - @Qualifier("IWorkspaceManagementService") - private IWorkspaceManagementService workspaceManagementService; - public static final String RESOURCE_ID = "resourceID"; public static final String RESOURCE_TYPE = "resourceType"; public static final String ROLE_DELIMITER = ","; @@ -70,15 +63,16 @@ * ORG_FOLDER_ID) and the user's private folder. See the method for more details. */ public static final Integer BOOTSTRAP_FOLDER_ID = new Integer(-1); - /** * Special value for folderID on getFolderContents(). Triggers getting the organisation folders that are available * to a user. See the method for more details. */ public static final Integer ORG_FOLDER_ID = new Integer(-2); - public static final Integer ROOT_ORG_FOLDER_ID = new Integer(1); + @Autowired + private IWorkspaceManagementService workspaceManagementService; + private Integer getUserId() { // return new Integer(WebUtil.readIntParam(request,AttributeNames.PARAM_USER_ID)); HttpSession ss = SessionManager.getSession(); Index: lams_common/src/java/org/lamsfoundation/lams/web/controller/LamsAuthoringFinishController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_common/src/java/org/lamsfoundation/lams/web/controller/LamsAuthoringFinishController.java (.../LamsAuthoringFinishController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_common/src/java/org/lamsfoundation/lams/web/controller/LamsAuthoringFinishController.java (.../LamsAuthoringFinishController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -43,7 +43,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; /** @@ -69,10 +68,8 @@ private static final String RE_EDIT_URL = "reEditUrl"; @Autowired - @Qualifier("logEventService") private ILogEventService logEventService; @Autowired - @Qualifier("lamsToolService") private ILamsToolService lamsToolService; /** Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java (.../GradebookController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java (.../GradebookController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -59,7 +59,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -69,34 +68,24 @@ import com.fasterxml.jackson.databind.node.ObjectNode; /** + * Handles the general requests for content in gradebook + * * @author lfoxton - * - * Handles the general requests for content in gradebook */ @Controller @RequestMapping("/gradebook") public class GradebookController { - private static Logger logger = Logger.getLogger(GradebookController.class); @Autowired - @Qualifier("gradebookService") private IGradebookFullService gradebookService; - @Autowired - @Qualifier("userManagementService") - private IUserManagementService userService; - + private IUserManagementService userManagementService; @Autowired - @Qualifier("lessonService") private ILessonService lessonService; - @Autowired - @Qualifier("securityService") private ISecurityService securityService; - @Autowired - @Qualifier("learnerService") private ILearnerService learnerService; @RequestMapping("") @@ -379,7 +368,7 @@ //calculate totalUsers totalUsers = lesson.getAllLearners().size(); if (groupId != null) { - Group group = (Group) userService.findById(Group.class, groupId); + Group group = (Group) userManagementService.findById(Group.class, groupId); if (group != null) { totalUsers = group.getUsers().size(); } @@ -400,7 +389,7 @@ return null; } - Organisation org = (Organisation) userService.findById(Organisation.class, organisationID); + Organisation org = (Organisation) userManagementService.findById(Organisation.class, organisationID); gradebookUserDTOs = gradebookService.getGBUserRowsForOrganisation(org, page - 1, rowLimit, sortOrder, searchString); totalUsers = gradebookService.getCountUsersByOrganisation(organisationID, searchString); @@ -451,7 +440,7 @@ String searchString = WebUtil.readStrParam(request, GradebookConstants.PARAM_SEARCH_STRING, true); GBGridView view = GradebookUtil.readGBGridViewParam(request, GradebookConstants.PARAM_VIEW, false); Integer courseID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID); - Organisation organisation = (Organisation) userService.findById(Organisation.class, courseID); + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, courseID); // in case of toolbar searching (which uses different parameters than a single field searching) get those // parameters @@ -478,7 +467,7 @@ User viewer = getRealUser(); if (view == GBGridView.MON_USER) { Integer userID = WebUtil.readIntParam(request, GradebookConstants.PARAM_USERID); - user = (User) userService.findById(User.class, userID); + user = (User) userManagementService.findById(User.class, userID); } else { user = getRealUser(); } @@ -563,7 +552,7 @@ } Lesson lesson = lessonService.getLesson(lessonID); - User learner = (User) userService.findById(User.class, userID); + User learner = (User) userManagementService.findById(User.class, userID); if ((lesson != null) && (learner != null)) { GradebookUserLesson lessonMark = gradebookService.getGradebookUserLesson(lessonID, userID); @@ -672,7 +661,7 @@ private User getRealUser() { UserDTO userDTO = getUser(); if (userDTO != null) { - return userService.getUserByLogin(userDTO.getLogin()); + return userManagementService.getUserByLogin(userDTO.getLogin()); } else { return null; } Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookLearningController.java =================================================================== diff -u -r1704c05d7e844f968d3700990957ff05f3611ba5 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookLearningController.java (.../GradebookLearningController.java) (revision 1704c05d7e844f968d3700990957ff05f3611ba5) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookLearningController.java (.../GradebookLearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -36,29 +36,23 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; /** + * Handles the learner interfaces for gradebook. + * This is where marking for an activity/lesson takes place + * * @author lfoxton - * - * Handles the learner interfaces for gradebook - * - * This is where marking for an activity/lesson takes place */ @Controller @RequestMapping("/gradebookLearning") public class GradebookLearningController { - private static Logger logger = Logger.getLogger(GradebookLearningController.class); @Autowired - @Qualifier("userManagementService") - private IUserManagementService userService; - + private IUserManagementService userManagementService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @RequestMapping("") @@ -87,7 +81,7 @@ .debug("Getting learner gradebook for organisation: " + oranisationID); } - Organisation organisation = (Organisation) userService.findById(Organisation.class, oranisationID); + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, oranisationID); request.setAttribute("organisationID", oranisationID); request.setAttribute("organisationName", organisation.getName()); request.setAttribute("fullName", user.getFirstName() + " " + user.getLastName()); Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java (.../GradebookMonitoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java (.../GradebookMonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -57,7 +57,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -67,32 +66,23 @@ import com.fasterxml.jackson.databind.node.ObjectNode; /** + * Handles the monitor interfaces for gradebook. + * This is where marking for an activity/lesson takes place + * * @author lfoxton - * - * Handles the monitor interfaces for gradebook - * - * This is where marking for an activity/lesson takes place */ @Controller @RequestMapping("/gradebookMonitoring") public class GradebookMonitoringController { - private static Logger log = Logger.getLogger(GradebookMonitoringController.class); @Autowired - @Qualifier("gradebookService") private IGradebookFullService gradebookService; - @Autowired - @Qualifier("userManagementService") - private IUserManagementService userService; - + private IUserManagementService userManagementService; @Autowired - @Qualifier("lessonService") private ILessonService lessonService; - @Autowired - @Qualifier("securityService") private ISecurityService securityService; @RequestMapping("") @@ -152,7 +142,7 @@ return null; } - Organisation organisation = (Organisation) userService.findById(Organisation.class, organisationID); + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, organisationID); request.setAttribute("organisationID", organisationID); request.setAttribute("organisationName", organisation.getName()); @@ -183,7 +173,7 @@ } Integer userID = WebUtil.readIntParam(request, GradebookConstants.PARAM_ID); - User learner = (User) userService.findById(User.class, userID); + User learner = (User) userManagementService.findById(User.class, userID); if (learner == null) { GradebookMonitoringController.log .error("User with ID " + userID + " could not be found to update his lesson gradebook"); @@ -245,7 +235,7 @@ response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Wrong activity"); } - User learner = (User) userService.findById(User.class, userID); + User learner = (User) userManagementService.findById(User.class, userID); if (learner == null) { GradebookMonitoringController.log .error("User with ID " + userID + " could not be found to update his activity gradebook"); @@ -351,7 +341,7 @@ response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the organisation"); } - Organisation organisation = (Organisation) userService.findById(Organisation.class, organisationID); + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, organisationID); if (GradebookMonitoringController.log.isDebugEnabled()) { GradebookMonitoringController.log.debug("Exporting to a spreadsheet course: " + organisationID); } @@ -391,7 +381,7 @@ boolean simplified = WebUtil.readBooleanParam(request, "simplified", false); - Organisation organisation = (Organisation) userService.findById(Organisation.class, organisationID); + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, organisationID); String[] lessonIds = request.getParameterValues(AttributeNames.PARAM_LESSON_ID); if (GradebookMonitoringController.log.isDebugEnabled()) { GradebookMonitoringController.log.debug("Exporting to a spreadsheet lessons " + Arrays.toString(lessonIds) Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java (.../KumaliveController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java (.../KumaliveController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -28,6 +28,7 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -48,7 +49,9 @@ private static Logger log = Logger.getLogger(KumaliveController.class); + @Autowired private static IKumaliveService kumaliveService; + @Autowired private static ISecurityService securityService; @RequestMapping("/getRubrics") @@ -62,15 +65,15 @@ response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); return null; } - if (!KumaliveController.getSecurityService().hasOrgRole(organisationId, currentUserId, + if (!securityService.hasOrgRole(organisationId, currentUserId, new String[] { Role.GROUP_MANAGER, Role.MONITOR }, "kumalive get rubrics", false)) { String warning = "User " + currentUserId + " is not a monitor of organisation " + organisationId; log.warn(warning); response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); return null; } - List rubrics = KumaliveController.getKumaliveService().getRubrics(organisationId); + List rubrics = kumaliveService.getRubrics(organisationId); ArrayNode rubricsJSON = JsonNodeFactory.instance.arrayNode(); for (KumaliveRubric rubric : rubrics) { rubricsJSON.add(rubric.getName()); @@ -91,7 +94,7 @@ response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); return null; } - if (!KumaliveController.getSecurityService().hasOrgRole(organisationId, currentUserId, + if (!securityService.hasOrgRole(organisationId, currentUserId, new String[] { Role.GROUP_MANAGER, Role.MONITOR }, "kumalive get report", false)) { String warning = "User " + currentUserId + " is not a monitor of organisation " + organisationId; log.warn(warning); @@ -115,7 +118,7 @@ response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); return null; } - if (!KumaliveController.getSecurityService().hasOrgRole(organisationId, currentUserId, + if (!securityService.hasOrgRole(organisationId, currentUserId, new String[] { Role.GROUP_MANAGER, Role.MONITOR }, "kumalive get report organisation data", false)) { String warning = "User " + currentUserId + " is not a monitor of organisation " + organisationId; log.warn(warning); @@ -128,7 +131,7 @@ String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD); String sortColumn = WebUtil.readStrParam(request, CommonConstants.PARAM_SIDX, true); - ObjectNode resultJSON = KumaliveController.getKumaliveService().getReportOrganisationData(organisationId, + ObjectNode resultJSON = kumaliveService.getReportOrganisationData(organisationId, sortColumn, !"DESC".equalsIgnoreCase(sortOrder), rowLimit, page); response.setContentType("text/xml;charset=utf-8"); return resultJSON.toString(); @@ -141,15 +144,15 @@ UserDTO userDTO = getUserDTO(); Integer currentUserId = userDTO.getUserID(); Long kumaliveId = WebUtil.readLongParam(request, "kumaliveId", false); - Kumalive kumalive = KumaliveController.getKumaliveService().getKumalive(kumaliveId); + Kumalive kumalive = kumaliveService.getKumalive(kumaliveId); Organisation organisation = kumalive.getOrganisation(); if (!Configuration.getAsBoolean(ConfigurationKeys.ALLOW_KUMALIVE)) { String warning = "Kumalives are disabled"; log.warn(warning); response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); return null; } - if (!KumaliveController.getSecurityService().hasOrgRole(organisation.getOrganisationId(), currentUserId, + if (!securityService.hasOrgRole(organisation.getOrganisationId(), currentUserId, new String[] { Role.GROUP_MANAGER, Role.MONITOR }, "kumalive get report kumalive rubrics", false)) { String warning = "User " + currentUserId + " is not a monitor of organisation " + organisation.getOrganisationId(); @@ -175,15 +178,15 @@ UserDTO userDTO = getUserDTO(); Integer currentUserId = userDTO.getUserID(); Long kumaliveId = WebUtil.readLongParam(request, "kumaliveId", false); - Kumalive kumalive = KumaliveController.getKumaliveService().getKumalive(kumaliveId); + Kumalive kumalive = kumaliveService.getKumalive(kumaliveId); Organisation organisation = kumalive.getOrganisation(); if (!Configuration.getAsBoolean(ConfigurationKeys.ALLOW_KUMALIVE)) { String warning = "Kumalives are disabled"; log.warn(warning); response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); return null; } - if (!KumaliveController.getSecurityService().hasOrgRole(organisation.getOrganisationId(), currentUserId, + if (!securityService.hasOrgRole(organisation.getOrganisationId(), currentUserId, new String[] { Role.GROUP_MANAGER, Role.MONITOR }, "kumalive get report kumalive data", false)) { String warning = "User " + currentUserId + " is not a monitor of organisation " + organisation.getOrganisationId(); @@ -194,7 +197,7 @@ String sortOrder = WebUtil.readStrParam(request, CommonConstants.PARAM_SORD); - ObjectNode responseJSON = KumaliveController.getKumaliveService().getReportKumaliveData(kumaliveId, + ObjectNode responseJSON = kumaliveService.getReportKumaliveData(kumaliveId, !"DESC".equalsIgnoreCase(sortOrder)); response.setContentType("text/json;charset=utf-8"); return responseJSON.toString(); @@ -207,15 +210,15 @@ Integer currentUserId = userDTO.getUserID(); Long kumaliveId = WebUtil.readLongParam(request, "kumaliveId", false); Integer userId = WebUtil.readIntParam(request, "userId", false); - Kumalive kumalive = KumaliveController.getKumaliveService().getKumalive(kumaliveId); + Kumalive kumalive = kumaliveService.getKumalive(kumaliveId); Organisation organisation = kumalive.getOrganisation(); if (!Configuration.getAsBoolean(ConfigurationKeys.ALLOW_KUMALIVE)) { String warning = "Kumalives are disabled"; log.warn(warning); response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); return null; } - if (!KumaliveController.getSecurityService().hasOrgRole(organisation.getOrganisationId(), currentUserId, + if (!securityService.hasOrgRole(organisation.getOrganisationId(), currentUserId, new String[] { Role.GROUP_MANAGER, Role.MONITOR }, "kumalive get report user data", false)) { String warning = "User " + currentUserId + " is not a monitor of organisation " + organisation.getOrganisationId(); @@ -224,7 +227,7 @@ return null; } - ObjectNode responseJSON = KumaliveController.getKumaliveService().getReportUserData(kumaliveId, userId); + ObjectNode responseJSON = kumaliveService.getReportUserData(kumaliveId, userId); response.setContentType("text/json;charset=utf-8"); return responseJSON.toString(); } @@ -245,7 +248,7 @@ kumaliveIds.add(kumaliveIdJSON.asLong()); } - Kumalive kumalive = KumaliveController.getKumaliveService().getKumalive(kumaliveIds.get(0)); + Kumalive kumalive = kumaliveService.getKumalive(kumaliveIds.get(0)); organisationId = kumalive.getOrganisation().getOrganisationId(); } @@ -254,7 +257,7 @@ log.warn(warning); response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); } - if (!KumaliveController.getSecurityService().hasOrgRole(organisationId, currentUserId, + if (!securityService.hasOrgRole(organisationId, currentUserId, new String[] { Role.GROUP_MANAGER, Role.MONITOR }, "kumalive export", false)) { String warning = "User " + currentUserId + " is not a monitor of organisation " + organisationId; log.warn(warning); @@ -263,9 +266,9 @@ LinkedHashMap dataToExport = null; if (kumaliveIds == null) { - dataToExport = KumaliveController.getKumaliveService().exportKumalives(organisationId); + dataToExport = kumaliveService.exportKumalives(organisationId); } else { - dataToExport = KumaliveController.getKumaliveService().exportKumalives(kumaliveIds); + dataToExport = kumaliveService.exportKumalives(kumaliveIds); } String fileName = "kumalive_report.xlsx"; fileName = FileUtil.encodeFilenameForDownload(request, fileName); @@ -294,38 +297,20 @@ log.warn(warning); response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); } - if (!KumaliveController.getSecurityService().hasOrgRole(organisationId, userId, + if (!securityService.hasOrgRole(organisationId, userId, new String[] { Role.GROUP_MANAGER, Role.MONITOR }, "kumalive get rubrics", false)) { String warning = "User " + userId + " is not a monitor of organisation " + organisationId; log.warn(warning); response.sendError(HttpServletResponse.SC_FORBIDDEN, warning); } ArrayNode rubricsJSON = JsonUtil.readArray(WebUtil.readStrParam(request, "rubrics")); - KumaliveController.getKumaliveService().saveRubrics(organisationId, rubricsJSON); + kumaliveService.saveRubrics(organisationId, rubricsJSON); } private UserDTO getUserDTO() { HttpSession ss = SessionManager.getSession(); return (UserDTO) ss.getAttribute(AttributeNames.USER); } - - private static IKumaliveService getKumaliveService() { - if (kumaliveService == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getWebApplicationContext(SessionManager.getServletContext()); - kumaliveService = (IKumaliveService) ctx.getBean("kumaliveService"); - } - return kumaliveService; - } - - private static ISecurityService getSecurityService() { - if (securityService == null) { - WebApplicationContext ctx = WebApplicationContextUtils - .getRequiredWebApplicationContext(SessionManager.getServletContext()); - securityService = (ISecurityService) ctx.getBean("securityService"); - } - return securityService; - } } \ No newline at end of file Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/BranchingActivityController.java =================================================================== diff -u -r54007f98ca71e0073f19c5db78536437123287c6 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/BranchingActivityController.java (.../BranchingActivityController.java) (revision 54007f98ca71e0073f19c5db78536437123287c6) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/BranchingActivityController.java (.../BranchingActivityController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -43,7 +43,6 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -53,21 +52,17 @@ * Action class to display an OptionsActivity. * * @author daveg - * */ @Controller @RequestMapping("/branching") public class BranchingActivityController { - private static Logger log = Logger.getLogger(BranchingActivityController.class); /** Input parameter. Boolean value */ public static final String PARAM_FORCE_GROUPING = "force"; @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; - @Autowired private WebApplicationContext applicationContext; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java =================================================================== diff -u -rce8ce53765e38b46bd112a5933089d51bac130de -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java (.../ChooseActivityController.java) (revision ce8ce53765e38b46bd112a5933089d51bac130de) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java (.../ChooseActivityController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -35,7 +35,6 @@ import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,15 +45,12 @@ */ @Controller public class ChooseActivityController { + private static Logger log = Logger.getLogger(ChooseActivityController.class); protected static String className = "ChooseActivity"; - private static Logger log = Logger.getLogger(ChooseActivityController.class); - @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; - @Autowired private WebApplicationContext applicationContext; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java (.../CompleteActivityController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java (.../CompleteActivityController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.integration.service.IntegrationService; +import org.lamsfoundation.lams.integration.service.IIntegrationService; import org.lamsfoundation.lams.learning.service.ILearnerFullService; import org.lamsfoundation.lams.learning.service.LearnerServiceException; import org.lamsfoundation.lams.learning.web.form.ActivityForm; @@ -41,26 +41,23 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; /** * @author daveg */ @Controller public class CompleteActivityController { - private static Logger log = Logger.getLogger(CompleteActivityController.class); protected static String className = "CompleteActivity"; - private static IntegrationService integrationService = null; @Autowired - @Qualifier("learnerService") + private IIntegrationService integrationService; + @Autowired private ILearnerFullService learnerService; @Autowired @@ -99,7 +96,7 @@ // if user has already completed the lesson - we need to let integrations servers know to come and pick up // updated marks (as it won't happen at lessoncomplete.jsp page) if (progress.isComplete()) { - String lessonFinishCallbackUrl = getIntegrationService().getLessonFinishCallbackUrl(progress.getUser(), + String lessonFinishCallbackUrl = integrationService.getLessonFinishCallbackUrl(progress.getUser(), progress.getLesson()); if (lessonFinishCallbackUrl != null) { request.setAttribute("lessonFinishUrl", lessonFinishCallbackUrl); @@ -119,13 +116,4 @@ } return forward; } - - private IntegrationService getIntegrationService() { - if (CompleteActivityController.integrationService == null) { - CompleteActivityController.integrationService = (IntegrationService) WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()) - .getBean("integrationService"); - } - return CompleteActivityController.integrationService; - } } \ No newline at end of file Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayActivityController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayActivityController.java (.../DisplayActivityController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayActivityController.java (.../DisplayActivityController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -36,7 +36,6 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.context.WebApplicationContext; @@ -52,18 +51,12 @@ */ @Controller public class DisplayActivityController { - - //--------------------------------------------------------------------- - // Instance variables - //--------------------------------------------------------------------- private static Logger log = Logger.getLogger(DisplayActivityController.class); public static final String PARAM_INITIAL_DISPLAY = "initialDisplay"; @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; - @Autowired private WebApplicationContext applicationContext; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java =================================================================== diff -u -rce8ce53765e38b46bd112a5933089d51bac130de -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java (.../DisplayOptionsActivityController.java) (revision ce8ce53765e38b46bd112a5933089d51bac130de) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java (.../DisplayOptionsActivityController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -42,7 +42,6 @@ import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -55,15 +54,12 @@ */ @Controller public class DisplayOptionsActivityController { - private static Logger log = Logger.getLogger(DisplayOptionsActivityController.class); public static final String RELEASED_LESSONS_REQUEST_ATTRIBUTE = "releasedLessons"; @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; - @Autowired private WebApplicationContext applicationContext; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayParallelActivityController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayParallelActivityController.java (.../DisplayParallelActivityController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayParallelActivityController.java (.../DisplayParallelActivityController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -41,7 +41,6 @@ import org.lamsfoundation.lams.learningdesign.ParallelActivity; import org.lamsfoundation.lams.learningdesign.dto.ActivityURL; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,13 +53,10 @@ */ @Controller public class DisplayParallelActivityController { - private static Logger log = Logger.getLogger(DisplayParallelActivityController.class); @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; - @Autowired private WebApplicationContext applicationContext; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayToolActivityController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayToolActivityController.java (.../DisplayToolActivityController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayToolActivityController.java (.../DisplayToolActivityController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -34,7 +34,6 @@ import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.context.WebApplicationContext; @@ -46,13 +45,10 @@ */ @Controller public class DisplayToolActivityController { - private static Logger log = Logger.getLogger(DisplayToolActivityController.class); @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; - @Autowired private WebApplicationContext applicationContext; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java =================================================================== diff -u -r54007f98ca71e0073f19c5db78536437123287c6 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java (.../GateController.java) (revision 54007f98ca71e0073f19c5db78536437123287c6) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java (.../GateController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -49,7 +49,6 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -73,17 +72,13 @@ *

* * @author Jacky Fang - * @since 2005-4-7 - * @version 1.1 */ @Controller @RequestMapping("/gate") public class GateController { @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; - @Autowired private WebApplicationContext applicationContext; // --------------------------------------------------------------------- Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java =================================================================== diff -u -r54007f98ca71e0073f19c5db78536437123287c6 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java (.../GroupingController.java) (revision 54007f98ca71e0073f19c5db78536437123287c6) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java (.../GroupingController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -47,7 +47,6 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -72,21 +71,13 @@ @Controller @RequestMapping("/grouping") public class GroupingController { - - /** Input parameter. Boolean value */ - public static final String PARAM_FORCE_GROUPING = "force"; - - // --------------------------------------------------------------------- - // Instance variables - // --------------------------------------------------------------------- private static Logger log = Logger.getLogger(GroupingController.class); @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; - @Autowired private WebApplicationContext applicationContext; + // --------------------------------------------------------------------- // Class level constants - Session Attributes // --------------------------------------------------------------------- @@ -96,10 +87,9 @@ public static final String TITLE = "title"; public static final String MAX_LEARNERS_PER_GROUP = "maxLearnersPerGroup"; public static final String VIEW_STUDENTS_BEFORE_SELECTION = "viewStudentsBeforeSelection"; + /** Input parameter. Boolean value */ + public static final String PARAM_FORCE_GROUPING = "force"; - // --------------------------------------------------------------------- - // Struts Dispatch Method - // --------------------------------------------------------------------- /** * Perform the grouping for the users who are currently running the lesson. If force is set to true, then we should * be in preview mode, and we want to override the chosen grouping to make it group straight away. Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java (.../LearnerController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java (.../LearnerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -52,6 +52,8 @@ import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.monitoring.service.IMonitoringService; import org.lamsfoundation.lams.tool.ToolSession; +import org.lamsfoundation.lams.tool.service.ILamsCoreToolService; +import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; @@ -72,7 +74,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; /** - * *

* The action servlet that interacts with learner to start a lams learner module, join a user to the lesson and allows a * user to exit a lesson. @@ -87,41 +88,27 @@ * features to solve duplicate submission problem. * * @author Jacky Fang - * @since 3/03/2005 - * @version 1.1 */ @Controller @RequestMapping("/learner") public class LearnerController { - // --------------------------------------------------------------------- - // Instance variables - // --------------------------------------------------------------------- private static Logger log = Logger.getLogger(LearnerController.class); @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; - @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; - @Autowired - @Qualifier("gradebookService") private IGradebookService gradebookService; - @Autowired - @Qualifier("monitoringService") private IMonitoringService monitoringService; - @Autowired - @Qualifier("lessonService") private ILessonService lessonService; - @Autowired + private ILamsToolService lamsToolService; + @Autowired @Qualifier("learningMessageService") private MessageService messageService; - @Autowired private WebApplicationContext applicationContext; @@ -134,10 +121,6 @@ "message.lesson.restart.button", "label.learner.progress.notebook", "button.exit", "label.learner.progress.support", "label.my.progress" }; - // --------------------------------------------------------------------- - // Class level constants - Struts forward - // --------------------------------------------------------------------- - @RequestMapping("/redirectToURL") @ResponseBody private String redirectToURL(HttpServletResponse response, String url) throws IOException, ServletException { @@ -185,8 +168,7 @@ // security check Lesson lesson = learnerService.getLesson(lessonID); - User user = (User) LearnerServiceProxy.getUserManagementService(applicationContext.getServletContext()) - .findById(User.class, learner); + User user = (User) userManagementService.findById(User.class, learner); if ((lesson.getLessonClass() == null) || !lesson.getLessonClass().getLearners().contains(user)) { request.setAttribute("messageKey", "User " + user.getLogin() + " is not a learner in the requested lesson."); @@ -295,8 +277,7 @@ if (lessonId == null) { // depending on when this is called, there may only be a toolSessionId known, not the lessonId. Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); - ToolSession toolSession = LearnerServiceProxy.getLamsToolService(applicationContext.getServletContext()) - .getToolSession(toolSessionId); + ToolSession toolSession = lamsToolService.getToolSession(toolSessionId); lessonId = toolSession.getLesson().getLessonId(); } @@ -434,13 +415,10 @@ private ObjectNode getProgressBarMessages() { ObjectNode progressBarMessages = JsonNodeFactory.instance.objectNode(); - MessageService messageService = LearnerServiceProxy - .getMonitoringMessageService(applicationContext.getServletContext()); for (String key : MONITOR_MESSAGE_KEYS) { String value = messageService.getMessage(key); progressBarMessages.put(key, value); } - messageService = LearnerServiceProxy.getMessageService(applicationContext.getServletContext()); for (String key : LEARNER_MESSAGE_KEYS) { String value = messageService.getMessage(key); progressBarMessages.put(key, value); @@ -464,8 +442,7 @@ } else { Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); - ToolSession toolSession = LearnerServiceProxy.getLamsToolService(applicationContext.getServletContext()) - .getToolSession(toolSessionId); + ToolSession toolSession = lamsToolService.getToolSession(toolSessionId); lesson = toolSession.getLesson(); } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LessonCompleteActivityController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LessonCompleteActivityController.java (.../LessonCompleteActivityController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LessonCompleteActivityController.java (.../LessonCompleteActivityController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -28,18 +28,15 @@ import javax.servlet.http.HttpServletRequest; -import org.lamsfoundation.lams.integration.service.IntegrationService; +import org.lamsfoundation.lams.integration.service.IIntegrationService; import org.lamsfoundation.lams.learning.service.ILearnerFullService; import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.service.ILessonService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; /** * Action class run when the learner finishes a lesson. @@ -50,19 +47,14 @@ public static final String RELEASED_LESSONS_REQUEST_ATTRIBUTE = "releasedLessons"; @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; @Autowired - private static IntegrationService integrationService; + private IIntegrationService integrationService; @Autowired - @Qualifier("lessonService") - private static ILessonService lessonService; + private ILessonService lessonService; - @Autowired - private WebApplicationContext applicationContext; - /** * Gets an activity from the request (attribute) and forwards onto a display action using the ActionMappings class. * If no activity is in request then use the current activity in learnerProgress. @@ -72,7 +64,7 @@ public String execute(HttpServletRequest request) throws UnsupportedEncodingException { LearnerProgress learnerProgress = LearningWebUtil.getLearnerProgress(request, learnerService); Lesson lesson = learnerProgress.getLesson(); - Set releasedLessons = getLessonService().getReleasedSucceedingLessons(lesson.getLessonId(), + Set releasedLessons = lessonService.getReleasedSucceedingLessons(lesson.getLessonId(), learnerProgress.getUser().getUserId()); if (!releasedLessons.isEmpty()) { StringBuilder releasedLessonNames = new StringBuilder(); @@ -84,7 +76,7 @@ } //checks for lessonFinishUrl parameter - String lessonFinishCallbackUrl = getIntegrationService().getLessonFinishCallbackUrl(learnerProgress.getUser(), + String lessonFinishCallbackUrl = integrationService.getLessonFinishCallbackUrl(learnerProgress.getUser(), lesson); if (lessonFinishCallbackUrl != null) { request.setAttribute("lessonFinishUrl", lessonFinishCallbackUrl); @@ -94,21 +86,4 @@ return "lessonComplete"; } - - private IntegrationService getIntegrationService() { - if (LessonCompleteActivityController.integrationService == null) { - LessonCompleteActivityController.integrationService = (IntegrationService) WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()) - .getBean("integrationService"); - } - return LessonCompleteActivityController.integrationService; - } - - private ILessonService getLessonService() { - if (LessonCompleteActivityController.lessonService == null) { - LessonCompleteActivityController.lessonService = (ILessonService) WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()).getBean("lessonService"); - } - return LessonCompleteActivityController.lessonService; - } } \ No newline at end of file Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java (.../LoadToolActivityController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java (.../LoadToolActivityController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -40,7 +40,6 @@ import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.tool.exception.RequiredGroupMissingException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -53,12 +52,9 @@ */ @Controller public class LoadToolActivityController { - private static Logger log = Logger.getLogger(LoadToolActivityController.class); @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; - @Autowired private WebApplicationContext applicationContext; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java (.../NotebookController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java (.../NotebookController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletRequest; import org.lamsfoundation.lams.learning.service.ILearnerFullService; -import org.lamsfoundation.lams.learning.service.LearnerServiceProxy; import org.lamsfoundation.lams.learning.web.form.NotebookForm; import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.lesson.Lesson; @@ -40,14 +39,13 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; /** * @author M Seaton @@ -56,15 +54,11 @@ @RequestMapping("/notebook") public class NotebookController { @Autowired - @Qualifier("coreNotebookService") - private ICoreNotebookService notebookService; - + private ICoreNotebookService coreNotebookService; @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; - @Autowired - private WebApplicationContext applicationContext; + private IUserManagementService userManagementService; /** * View all notebook entries @@ -84,7 +78,7 @@ // get all notebook entries for the learner - TreeMap> entries = notebookService.getEntryByLesson(learnerID, + TreeMap> entries = coreNotebookService.getEntryByLesson(learnerID, CoreNotebookConstants.SCRATCH_PAD); request.getSession().setAttribute("entries", entries.values()); @@ -103,8 +97,7 @@ // getting requested object according to coming parameters Integer userID = LearningWebUtil.getUserId(); - User user = (User) LearnerServiceProxy.getUserManagementService(applicationContext.getServletContext()) - .findById(User.class, userID); + User user = (User) userManagementService.findById(User.class, userID); // lesson service Long lessonID = notebookForm.getLessonID(); @@ -156,7 +149,7 @@ return null; } - return notebookService.getEntry(lessonID, CoreNotebookConstants.SCRATCH_PAD, CoreNotebookConstants.JOURNAL_SIG); + return coreNotebookService.getEntry(lessonID, CoreNotebookConstants.SCRATCH_PAD, CoreNotebookConstants.JOURNAL_SIG); } @@ -171,12 +164,11 @@ Long currentLessonID = notebookForm.getCurrentLessonID(); String mode = WebUtil.readStrParam(request, "mode", true); - NotebookEntry entry = notebookService.getEntry(uid); + NotebookEntry entry = coreNotebookService.getEntry(uid); // getting requested object according to coming parameters Integer userID = LearningWebUtil.getUserId(); - User user = (User) LearnerServiceProxy.getUserManagementService(applicationContext.getServletContext()) - .findById(User.class, userID); + User user = (User) userManagementService.findById(User.class, userID); if (entry.getUser() != null && !entry.getUser().getUserId().equals(user.getUserId())) { // wants to look at someone else's entry - check they are a teacher @@ -220,7 +212,7 @@ String signature = notebookForm.getSignature(); Integer userID = LearningWebUtil.getUserId(); - notebookService.createNotebookEntry(id, CoreNotebookConstants.SCRATCH_PAD, signature, userID, title, entry); + coreNotebookService.createNotebookEntry(id, CoreNotebookConstants.SCRATCH_PAD, signature, userID, title, entry); boolean skipViewAll = WebUtil.readBooleanParam(request, "skipViewAll", false); return skipViewAll ? null : viewAll(notebookForm, request); @@ -239,7 +231,7 @@ String signature = notebookForm.getSignature(); // get existing entry to edit - NotebookEntry entryObj = notebookService.getEntry(uid); + NotebookEntry entryObj = coreNotebookService.getEntry(uid); // check entry is being edited by it's owner Integer userID = LearningWebUtil.getUserId(); @@ -252,7 +244,7 @@ entryObj.setEntry(entry); entryObj.setExternalSignature(signature); - notebookService.updateEntry(entryObj); + coreNotebookService.updateEntry(entryObj); return viewAll(notebookForm, request); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java (.../SequenceActivityController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java (.../SequenceActivityController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -38,7 +38,6 @@ import org.lamsfoundation.lams.learningdesign.SequenceActivity; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.context.WebApplicationContext; @@ -48,18 +47,12 @@ * * Normally this will display the first activity inside a sequence activity. If there are no activities within the * sequence activity then it will display an "empty" message. - * - * - * */ @Controller public class SequenceActivityController { - private static Logger log = Logger.getLogger(SequenceActivityController.class); @Autowired - @Qualifier("learnerService") private ILearnerFullService learnerService; - @Autowired private WebApplicationContext applicationContext; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java =================================================================== diff -u -r7e05bfe2c334b0b3224bbbdd3d6b7f10b383ee9f -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java (.../LogLessonMarkPushedToIntegrationsServlet.java) (revision 7e05bfe2c334b0b3224bbbdd3d6b7f10b383ee9f) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java (.../LogLessonMarkPushedToIntegrationsServlet.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.PrintWriter; +import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -37,20 +38,25 @@ import org.lamsfoundation.lams.util.WebUtil; 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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.context.support.SpringBeanAutowiringSupport; @SuppressWarnings("serial") public class LogLessonMarkPushedToIntegrationsServlet extends HttpServlet { private static Logger log = Logger.getLogger(LogLessonMarkPushedToIntegrationsServlet.class); - private static ILogEventService logEventService; + @Autowired + private ILogEventService logEventService; + /* + * Request Spring to lookup the applicationContext tied to the current ServletContext and inject service beans + * available in that applicationContext. + */ @Override - public void init() throws ServletException { - WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext()); - logEventService = (ILogEventService) ctx.getBean("logEventService"); + public void init(ServletConfig config) throws ServletException { + super.init(config); + SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this, config.getServletContext()); } @Override Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java (.../RepopulateProgressMarksServlet.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java (.../RepopulateProgressMarksServlet.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.Set; +import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -52,24 +53,31 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.SpringBeanAutowiringSupport; import org.springframework.web.context.support.WebApplicationContextUtils; @SuppressWarnings("serial") public class RepopulateProgressMarksServlet extends HttpServlet { private static Logger log = Logger.getLogger(RepopulateProgressMarksServlet.class); - private static ILogEventService logEventService; - private static ILessonService lessonService; - private static ILearnerFullService learnerService; + @Autowired + private ILogEventService logEventService; + @Autowired + private ILessonService lessonService; + @Autowired + private ILearnerFullService learnerService; + /* + * Request Spring to lookup the applicationContext tied to the current ServletContext and inject service beans + * available in that applicationContext. + */ @Override - public void init() throws ServletException { - WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext()); - RepopulateProgressMarksServlet.logEventService = (ILogEventService) ctx.getBean("logEventService"); - RepopulateProgressMarksServlet.lessonService = (ILessonService) ctx.getBean("lessonService"); - RepopulateProgressMarksServlet.learnerService = (ILearnerFullService) ctx.getBean("learnerService"); + public void init(ServletConfig config) throws ServletException { + super.init(config); + SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this, config.getServletContext()); } @Override Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressController.java (.../ComplexLearnerProgressController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressController.java (.../ComplexLearnerProgressController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -48,7 +48,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -57,11 +56,9 @@ */ @Controller public class ComplexLearnerProgressController { - private static Logger log = Logger.getLogger(ComplexLearnerProgressController.class); @Autowired - @Qualifier("monitoringService") private IMonitoringFullService monitoringService; @RequestMapping("/complexProgress") Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java (.../EmailNotificationsController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java (.../EmailNotificationsController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -81,7 +81,6 @@ import org.quartz.TriggerKey; import org.quartz.impl.matchers.GroupMatcher; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.RequestMapping; @@ -112,28 +111,20 @@ private static final String JOB_PREFIX_NAME = "emailScheduleMessageJob:"; @Autowired - @Qualifier("eventNotificationService") private IEventNotificationService eventNotificationService; @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; @Autowired - @Qualifier("logEventService") private ILogEventService logEventService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @Autowired - @Qualifier("lessonService") private ILessonService lessonService; @Autowired - @Qualifier("monitoringService") private IMonitoringFullService monitoringService; @Autowired - @Qualifier("scheduler") private Scheduler scheduler; @Autowired - @Qualifier("learnerService") private ILearnerService learnerService; /** Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressController.java (.../EmailProgressController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressController.java (.../EmailProgressController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -55,7 +55,6 @@ import org.quartz.TriggerKey; import org.quartz.impl.matchers.GroupMatcher; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -70,21 +69,17 @@ @Controller @RequestMapping("/emailProgress") public class EmailProgressController { + private static Logger log = Logger.getLogger(EmailNotificationsController.class); + @Autowired - @Qualifier("monitoringService") private IMonitoringFullService monitoringService; @Autowired - @Qualifier("eventNotificationService") private IEventNotificationService eventNotificationService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @Autowired - @Qualifier("scheduler") private Scheduler scheduler; - private static Logger log = Logger.getLogger(EmailNotificationsController.class); - // --------------------------------------------------------------------- // Class level constants // --------------------------------------------------------------------- Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java (.../GateController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java (.../GateController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -56,7 +56,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -84,20 +83,15 @@ @RequestMapping("/gate") public class GateController { + private static final DateFormat SCHEDULING_DATETIME_FORMAT = new SimpleDateFormat("MM/dd/yy HH:mm"); + @Autowired - @Qualifier("monitoringService") private IMonitoringFullService monitoringService; - @Autowired - @Qualifier("learnerService") private ILearnerService learnerService; - @Autowired - @Qualifier("lessonService") private ILessonService lessonService; - private static final DateFormat SCHEDULING_DATETIME_FORMAT = new SimpleDateFormat("MM/dd/yy HH:mm"); - // --------------------------------------------------------------------- // Method // --------------------------------------------------------------------- Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java =================================================================== diff -u -rcb2cfe5b40c7aee12c9e500ee7800b5fa679821f -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java (.../GroupingAJAXController.java) (revision cb2cfe5b40c7aee12c9e500ee7800b5fa679821f) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java (.../GroupingAJAXController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -60,7 +60,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -80,19 +79,15 @@ @Controller @RequestMapping("/grouping") public class GroupingAJAXController { + private static Logger log = Logger.getLogger(GroupingAJAXController.class); @Autowired - @Qualifier("monitoringService") private IMonitoringFullService monitoringService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; - private static Logger log = Logger.getLogger(GroupingAJAXController.class); - // --------------------------------------------------------------------- private static final String CHOSEN_GROUPING_SCREEN = "chosenGrouping"; Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java =================================================================== diff -u -rcb2cfe5b40c7aee12c9e500ee7800b5fa679821f -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java (.../GroupingUploadAJAXController.java) (revision cb2cfe5b40c7aee12c9e500ee7800b5fa679821f) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java (.../GroupingUploadAJAXController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -94,21 +94,15 @@ @Controller @RequestMapping("/groupingUpload") public class GroupingUploadAJAXController { - private static Logger log = Logger.getLogger(GroupingUploadAJAXController.class); @Autowired - @Qualifier("monitoringService") private IMonitoringFullService monitoringService; - @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; @Autowired - @Qualifier("lessonService") private ILessonService lessonService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @Autowired @Qualifier("centralMessageService") Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java =================================================================== diff -u -rd635e725776fa9c7344e16d4ff83e8c562997663 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision d635e725776fa9c7344e16d4ff83e8c562997663) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -113,46 +113,32 @@ @Controller @RequestMapping("/monitoring") public class MonitoringController { - - @Autowired - private WebApplicationContext applicationContext; - private static Logger log = Logger.getLogger(MonitoringController.class); - // --------------------------------------------------------------------- - // Class level constants - Struts forward - // --------------------------------------------------------------------- private static final DateFormat LESSON_SCHEDULING_DATETIME_FORMAT = new SimpleDateFormat("MM/dd/yy HH:mm"); private static final int LATEST_LEARNER_PROGRESS_LESSON_DISPLAY_LIMIT = 53; private static final int LATEST_LEARNER_PROGRESS_ACTIVITY_DISPLAY_LIMIT = 7; private static final int USER_PAGE_SIZE = 10; + @Autowired - @Qualifier("logEventService") private ILogEventService logEventService; @Autowired - @Qualifier("lessonService") private ILessonService lessonService; @Autowired - @Qualifier("securityService") private ISecurityService securityService; @Autowired - @Qualifier("monitoringService") private IMonitoringFullService monitoringService; @Autowired - @Qualifier("userManagementService") private IUserManagementService userManagementService; @Autowired - @Qualifier("learnerService") private ILearnerService learnerService; @Autowired - @Qualifier("lamsToolService") - private ILamsToolService toolService; + private ILamsToolService lamsToolService; @Autowired @Qualifier("monitoringMessageService") private MessageService messageService; @Autowired - @Qualifier("authoringService") private IAuthoringService authoringService; private Integer getUserId() { @@ -1280,7 +1266,7 @@ ToolActivity toolActivity = (ToolActivity) activity; if (ILamsToolService.LEADER_SELECTION_TOOL_SIGNATURE .equals(toolActivity.getTool().getToolSignature())) { - leaders.addAll(toolService.getLeaderUserId(activity.getActivityId())); + leaders.addAll(lamsToolService.getLeaderUserId(activity.getActivityId())); } } } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceController.java (.../SequenceController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceController.java (.../SequenceController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -37,24 +37,19 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; /** * The action servlet that provides the support for the Sequence activities. At present, this is only a basic view * screen that lists the user's in the sequence. * - * - * - * * @author Fiona Malikoff */ @Controller public class SequenceController { @Autowired - @Qualifier("monitoringService") private IMonitoringFullService monitoringService; public static final String VIEW_SEQUENCE = "viewSequence"; Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java (.../TblMonitoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java (.../TblMonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -42,7 +42,6 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -57,19 +56,14 @@ private static Logger log = Logger.getLogger(TblMonitoringController.class); @Autowired - @Qualifier("lessonService") private ILessonService lessonService; @Autowired - @Qualifier("monitoringService") private IMonitoringFullService monitoringService; @Autowired - @Qualifier("lamsToolService") - private ILamsToolService toolService; + private ILamsToolService lamsToolService; @Autowired - @Qualifier("activityDAO") private IActivityDAO activityDAO; @Autowired - @Qualifier("gradebookService") private IGradebookService gradebookService; /** @@ -122,7 +116,7 @@ } Set leaderUserIds = leaderselectionToolActivityId == null ? new HashSet<>() - : toolService.getLeaderUserId(leaderselectionToolActivityId); + : lamsToolService.getLeaderUserId(leaderselectionToolActivityId); GroupingActivity groupingActivity = getGroupingActivity(lesson); Grouping grouping = groupingActivity == null ? null : groupingActivity.getCreateGrouping(); Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/controller/LearningController.java =================================================================== diff -u -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/controller/LearningController.java (.../LearningController.java) (revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -33,7 +33,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -42,16 +41,15 @@ public class LearningController { @Autowired - @Qualifier("lamsToolService") - private ILamsToolService toolService; + private ILamsToolService lamsToolService; @RequestMapping("") public String execute(HttpServletRequest request) { HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); - String finishURL = toolService.completeToolSession(toolSessionId, user.getUserID().longValue()); + String finishURL = lamsToolService.completeToolSession(toolSessionId, user.getUserID().longValue()); return "redirect:" + finishURL; } } \ No newline at end of file Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/AuthoringChatConditionController.java =================================================================== diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/AuthoringChatConditionController.java (.../AuthoringChatConditionController.java) (revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/AuthoringChatConditionController.java (.../AuthoringChatConditionController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -61,7 +61,6 @@ public class AuthoringChatConditionController { @Autowired - @Qualifier("chatService") private IChatService chatService; @Autowired Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/AuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -50,16 +50,13 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -/** - */ @Controller @RequestMapping("/authoring") public class AuthoringController { private static Logger logger = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("chatService") private IChatService chatService; @Autowired Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java (.../LearningController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -68,7 +68,6 @@ private static Logger log = Logger.getLogger(LearningController.class); @Autowired - @Qualifier("chatService") private IChatService chatService; @Autowired Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/MonitoringController.java =================================================================== diff -u -rf23f6693e999a16730433009b95264fa8af9e1a8 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f23f6693e999a16730433009b95264fa8af9e1a8) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -62,27 +62,13 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.context.WebApplicationContext; -/** - * @author - * @version - * - * - * - * - * - * - * - * - * - */ @Controller @RequestMapping("/monitoring") public class MonitoringController { private static Logger log = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("chatService") private IChatService chatService; @Autowired Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/PedagogicalPlannerController.java =================================================================== diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -42,23 +42,13 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -/** - * @author - * @version - * - * - * - * - * - */ @Controller @RequestMapping("/pedagogicalPlanner") public class PedagogicalPlannerController { private static Logger logger = Logger.getLogger(PedagogicalPlannerController.class); @Autowired - @Qualifier("chatService") private IChatService chatService; @Autowired Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -82,7 +82,6 @@ private static Logger log = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("dacoService") private IDacoService dacoService; @Autowired Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java =================================================================== diff -u -r7922cb321641adb3b2357e46e800b4ac21b36f14 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision 7922cb321641adb3b2357e46e800b4ac21b36f14) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -80,8 +80,6 @@ /** * * @author Marcin Cieslak - * - * @version $Revision$ */ @Controller @RequestMapping("/learning") @@ -93,7 +91,6 @@ private WebApplicationContext applicationContext; @Autowired - @Qualifier("dacoService") private IDacoService dacoService; @Autowired Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -62,7 +62,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -78,7 +77,6 @@ public static Logger log = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("dacoService") private IDacoService dacoService; @RequestMapping("/listRecords") Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/controller/LearningController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/controller/LearningController.java (.../LearningController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -33,7 +33,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -42,16 +41,15 @@ public class LearningController { @Autowired - @Qualifier("lamsToolService") - private ILamsToolService toolService; + private ILamsToolService lamsToolService; @RequestMapping("") public String execute(HttpServletRequest request) { HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); - String finishURL = toolService.completeToolSession(toolSessionId, user.getUserID().longValue()); + String finishURL = lamsToolService.completeToolSession(toolSessionId, user.getUserID().longValue()); return "redirect:" + finishURL; } } \ No newline at end of file Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AdminController.java =================================================================== diff -u -r1cef918442124e8d987a285095a7504e3bc00461 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AdminController.java (.../AdminController.java) (revision 1cef918442124e8d987a285095a7504e3bc00461) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AdminController.java (.../AdminController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -6,7 +6,6 @@ import org.lamsfoundation.lams.tool.dokumaran.service.IDokumaranService; import org.lamsfoundation.lams.tool.dokumaran.web.form.AdminForm; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,7 +18,6 @@ public class AdminController { @Autowired - @Qualifier("dokumaranService") private IDokumaranService dokumaranService; @RequestMapping("") Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -45,7 +45,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -60,7 +59,6 @@ private static Logger log = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("dokumaranService") private IDokumaranService dokumaranService; /** Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java =================================================================== diff -u -r1061286825c95ff76c63c5f081be60e88a8a1da2 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java (.../LearningController.java) (revision 1061286825c95ff76c63c5f081be60e88a8a1da2) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -55,7 +55,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -74,7 +73,6 @@ private static Logger log = Logger.getLogger(LearningController.class); @Autowired - @Qualifier("dokumaranService") private IDokumaranService dokumaranService; @Autowired Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java =================================================================== diff -u -r58e32af997a2da8fc96806124b29fc68fdefb149 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 58e32af997a2da8fc96806124b29fc68fdefb149) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -49,7 +49,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -60,7 +59,6 @@ public static Logger log = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("dokumaranService") private IDokumaranService dokumaranService; @RequestMapping("/summary") Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/controller/LearningController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/controller/LearningController.java (.../LearningController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -33,7 +33,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -42,16 +41,15 @@ public class LearningController { @Autowired - @Qualifier("lamsToolService") - private ILamsToolService toolService; + private ILamsToolService lamsToolService; @RequestMapping("/start") public String execute(HttpServletRequest request) { HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); - String finishURL = toolService.completeToolSession(toolSessionId, user.getUserID().longValue()); + String finishURL = lamsToolService.completeToolSession(toolSessionId, user.getUserID().longValue()); return "redirect:" + finishURL; } } \ No newline at end of file Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AdminController.java =================================================================== diff -u -r39e351aeeadf3d0973293c74f0c89432a954d2e8 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AdminController.java (.../AdminController.java) (revision 39e351aeeadf3d0973293c74f0c89432a954d2e8) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AdminController.java (.../AdminController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -28,7 +28,6 @@ import org.lamsfoundation.lams.tool.forum.service.IForumService; import org.lamsfoundation.lams.tool.forum.web.forms.AdminForm; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -41,7 +40,6 @@ public class AdminController { @Autowired - @Qualifier("forumService") private IForumService forumService; @RequestMapping("/start") Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringConditionController.java =================================================================== diff -u -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringConditionController.java (.../AuthoringConditionController.java) (revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringConditionController.java (.../AuthoringConditionController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -67,7 +67,6 @@ public class AuthoringConditionController { @Autowired - @Qualifier("forumService") private IForumService forumService; @Autowired Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java =================================================================== diff -u -rbda120a45147297c8a6652f5bb0378aabd1ed79b -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java (.../AuthoringController.java) (revision bda120a45147297c8a6652f5bb0378aabd1ed79b) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -87,16 +87,12 @@ private static Logger log = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("forumService") private IForumService forumService; @Autowired @Qualifier("forumMessageService") private MessageService messageService; - @Autowired - private WebApplicationContext applicationContext; - // ****************************************************************************************************************** // Forum Author functions // ****************************************************************************************************************** Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java =================================================================== diff -u -rbda120a45147297c8a6652f5bb0378aabd1ed79b -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java (.../LearningController.java) (revision bda120a45147297c8a6652f5bb0378aabd1ed79b) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -96,7 +96,6 @@ private static final boolean MODE_OPTIONAL = false; @Autowired - @Qualifier("forumService") private IForumService forumService; @Autowired Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -94,7 +94,6 @@ private static Logger log = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("forumService") private IForumService forumService; @Autowired Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AdminController.java =================================================================== diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AdminController.java (.../AdminController.java) (revision 1d6eef003bf303f75c5405b66a13ac86232cec03) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AdminController.java (.../AdminController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -29,7 +29,6 @@ import org.lamsfoundation.lams.tool.commonCartridge.service.ICommonCartridgeService; import org.lamsfoundation.lams.tool.commonCartridge.web.form.AdminForm; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -44,7 +43,6 @@ public class AdminController { @Autowired - @Qualifier("commonCartridgeService") private ICommonCartridgeService commonCartridgeService; @RequestMapping("/start") Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java =================================================================== diff -u -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -80,12 +80,10 @@ @Controller @RequestMapping("/authoring") public class AuthoringController { + private static Logger log = Logger.getLogger(AuthoringController.class); private static final String ITEM_TYPE = "itemType"; - private static Logger log = Logger.getLogger(AuthoringController.class); - @Autowired - @Qualifier("commonCartridgeService") private ICommonCartridgeService commonCartridgeService; @Autowired Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java (.../LearningController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -77,7 +77,6 @@ private WebApplicationContext applicationContext; @Autowired - @Qualifier("commonCartridgeService") private ICommonCartridgeService commonCartridgeService; @Autowired Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/MonitoringController.java =================================================================== diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 1d6eef003bf303f75c5405b66a13ac86232cec03) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -43,7 +43,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,7 +53,6 @@ public static Logger log = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("commonCartridgeService") private ICommonCartridgeService commonCartridgeService; @RequestMapping("/hideitem") Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/ViewItemController.java =================================================================== diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/ViewItemController.java (.../ViewItemController.java) (revision 1d6eef003bf303f75c5405b66a13ac86232cec03) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/ViewItemController.java (.../ViewItemController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -55,19 +55,17 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; @Controller public class ViewItemController { private static final Logger log = Logger.getLogger(ViewItemController.class); @Autowired - private WebApplicationContext applicationContext; + @Qualifier("commonCartridgeMessageService") + private MessageService messageService; @Autowired - @Qualifier("commonCartridgeService") private ICommonCartridgeService commonCartridgeService;; /** @@ -210,10 +208,6 @@ SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); CommonCartridgeItem item = getCommonCartridgeItem(request, sessionMap, mode); - WebApplicationContext wac = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - MessageService messageService = (MessageService) wac.getBean("commonCartridgeMessageService"); - // Get the post data for the placement String returnValues = LamsBasicLTIUtil.postLaunchHTML(commonCartridgeService, messageService, item); Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/CompleteItemServlet.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -25,6 +25,7 @@ import java.util.SortedSet; import java.util.TreeSet; +import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -35,29 +36,33 @@ import org.lamsfoundation.lams.tool.commonCartridge.CommonCartridgeConstants; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItem; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeUser; -import org.lamsfoundation.lams.tool.commonCartridge.service.CommonCartridgeServiceProxy; import org.lamsfoundation.lams.tool.commonCartridge.service.ICommonCartridgeService; import org.lamsfoundation.lams.tool.commonCartridge.util.CommonCartridgeItemComparator; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.context.support.SpringBeanAutowiringSupport; /** - * - * * @author mseaton */ @SuppressWarnings("serial") public class CompleteItemServlet extends HttpServlet { private static Logger log = Logger.getLogger(CompleteItemServlet.class); - private ICommonCartridgeService service; + @Autowired + private ICommonCartridgeService commonCartridgeService; + /* + * Request Spring to lookup the applicationContext tied to the current ServletContext and inject service beans + * available in that applicationContext. + */ @Override - public void init() throws ServletException { - service = CommonCartridgeServiceProxy.getCommonCartridgeService(getServletContext()); - super.init(); + public void init(ServletConfig config) throws ServletException { + super.init(config); + SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this, config.getServletContext()); } /** @@ -86,7 +91,7 @@ UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); Long sessionId = (Long) sessionMap.get(CommonCartridgeConstants.ATTR_TOOL_SESSION_ID); - service.setItemComplete(commonCartridgeItemUid, new Long(user.getUserID().intValue()), sessionId); + commonCartridgeService.setItemComplete(commonCartridgeItemUid, new Long(user.getUserID().intValue()), sessionId); // set commonCartridge item complete tag SortedSet commonCartridgeItemList = getCommonCartridgeItemList(sessionMap); @@ -97,7 +102,7 @@ } } - CommonCartridgeUser rUser = service.getUserByIDAndSession(new Long(user.getUserID()), sessionId); + CommonCartridgeUser rUser = commonCartridgeService.getUserByIDAndSession(new Long(user.getUserID()), sessionId); response.setContentType("text/javascript"); PrintWriter out = response.getWriter(); Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/AuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -55,7 +55,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -71,7 +70,6 @@ private static Logger logger = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("kalturaService") private IKalturaService kalturaService; // Authoring SessionMap key names Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/LearningController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/LearningController.java (.../LearningController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -85,7 +85,6 @@ private static Logger log = Logger.getLogger(LearningController.class); @Autowired - @Qualifier("kalturaService") private IKalturaService kalturaService; @Autowired Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/MonitoringController.java =================================================================== diff -u -r2b381314f275480d99d5487ab8827fdf4ed0c1e5 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 2b381314f275480d99d5487ab8827fdf4ed0c1e5) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -48,7 +48,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -63,7 +62,6 @@ private static Logger log = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("kalturaService") private IKalturaService kalturaService; @RequestMapping("") Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/PedagogicalPlannerController.java =================================================================== diff -u -rff911101cbe92d6813691c20c292fa04519820b4 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision ff911101cbe92d6813691c20c292fa04519820b4) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -44,11 +44,6 @@ /** * @author Andrey Balan - * - * - * - * - * */ @Controller @RequestMapping("/pedagogicalPlanner") @@ -57,7 +52,6 @@ private static Logger logger = Logger.getLogger(PedagogicalPlannerController.class); @Autowired - @Qualifier("kalturaService") private IKalturaService kalturaService; @Autowired Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java (.../McController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java (.../McController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -74,7 +74,6 @@ private static Logger logger = Logger.getLogger(McController.class.getName()); @Autowired - @Qualifier("mcService") private IMcService mcService; @Autowired Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java =================================================================== diff -u -r8e218cf691c1235001bd61a9e6f62c363f62124a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java (.../McLearningController.java) (revision 8e218cf691c1235001bd61a9e6f62c363f62124a) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java (.../McLearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -86,7 +86,6 @@ private static Logger logger = Logger.getLogger(McLearningController.class.getName()); @Autowired - @Qualifier("mcService") private IMcService mcService; @Autowired Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java =================================================================== diff -u -r8e218cf691c1235001bd61a9e6f62c363f62124a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java (.../McMonitoringController.java) (revision 8e218cf691c1235001bd61a9e6f62c363f62124a) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java (.../McMonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -88,7 +88,6 @@ private static Logger logger = Logger.getLogger(McMonitoringController.class.getName()); @Autowired - @Qualifier("mcService") private IMcService mcService; @Autowired Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java =================================================================== diff -u -r424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java (.../McPedagogicalPlannerController.java) (revision 424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java (.../McPedagogicalPlannerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -56,7 +56,6 @@ public class McPedagogicalPlannerController { @Autowired - @Qualifier("mcService") private IMcService mcService; @Autowired Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java =================================================================== diff -u -r424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision 424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -31,7 +31,6 @@ private static Logger logger = Logger.getLogger(TblMonitoringController.class.getName()); @Autowired - @Qualifier("mcService") private IMcService mcService; /** Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java =================================================================== diff -u -r21ffaba743a8aeb994ba62e03e2a82ae13344f9b -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java (.../QaMonitoringController.java) (revision 21ffaba743a8aeb994ba62e03e2a82ae13344f9b) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java (.../QaMonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -53,7 +53,6 @@ import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO; import org.lamsfoundation.lams.tool.qa.dto.QaStatsDTO; import org.lamsfoundation.lams.tool.qa.service.IQaService; -import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy; import org.lamsfoundation.lams.tool.qa.util.QaApplicationException; import org.lamsfoundation.lams.tool.qa.util.QaSessionComparator; import org.lamsfoundation.lams.tool.qa.util.QaUtils; @@ -64,12 +63,10 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.WebApplicationContext; import org.springframework.web.util.HtmlUtils; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -82,15 +79,11 @@ @Controller @RequestMapping("/monitoring") public class QaMonitoringController implements QaAppConstants { + private static Logger logger = Logger.getLogger(QaMonitoringController.class.getName()); @Autowired private IQaService qaService; - @Autowired - private WebApplicationContext applicationContext; - - private static Logger logger = Logger.getLogger(QaMonitoringController.class.getName()); - @RequestMapping("/") public String unspecified() throws IOException, ServletException, ToolException { return null; @@ -306,10 +299,6 @@ return null; } - private IQaService getQAService() { - return QaServiceProxy.getQaService(applicationContext.getServletContext()); - } - /** * Get Paged Reflections * @@ -334,7 +323,6 @@ } //return user list according to the given sessionID - IQaService qaService = getQAService(); List users = qaService.getUserReflectionsForTablesorter(toolSessionId, page, size, sorting, searchString); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java =================================================================== diff -u -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -88,17 +88,15 @@ @Controller @RequestMapping("/authoring") public class AuthoringController { + private static Logger log = Logger.getLogger(AuthoringController.class); + private static final int INIT_INSTRUCTION_COUNT = 2; private static final String INSTRUCTION_ITEM_DESC_PREFIX = "instructionItemDesc"; private static final String INSTRUCTION_ITEM_COUNT = "instructionCount"; private static final String ITEM_TYPE = "itemType"; - private static Logger log = Logger.getLogger(AuthoringController.class); - @Autowired - @Qualifier("resourceService") private IResourceService resourceService; - @Autowired @Qualifier("resourceMessageService") private MessageService messageService; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java =================================================================== diff -u -r95d68a35b1689a015509558416cc05d47ac0dd7a -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision 95d68a35b1689a015509558416cc05d47ac0dd7a) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -82,11 +82,9 @@ @Controller @RequestMapping("/learning") public class LearningController { - private static Logger log = Logger.getLogger(LearningController.class); @Autowired - @Qualifier("resourceService") private IResourceService resourceService; @Autowired Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -53,7 +53,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.util.HtmlUtils; @@ -68,7 +67,6 @@ public static Logger log = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("resourceService") private IResourceService resourceService; @RequestMapping("/summary") Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java (.../ViewItemController.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java (.../ViewItemController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -49,17 +49,14 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @Controller public class ViewItemController { - private static final Logger log = Logger.getLogger(ViewItemController.class); @Autowired - @Qualifier("resourceService") private IResourceService resourceService; /** Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -24,6 +24,7 @@ import java.util.SortedSet; import java.util.TreeSet; +import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -34,12 +35,13 @@ import org.lamsfoundation.lams.tool.rsrc.ResourceConstants; import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem; import org.lamsfoundation.lams.tool.rsrc.service.IResourceService; -import org.lamsfoundation.lams.tool.rsrc.service.ResourceServiceProxy; import org.lamsfoundation.lams.tool.rsrc.util.ResourceItemComparator; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.context.support.SpringBeanAutowiringSupport; /** * @@ -50,12 +52,17 @@ public class CompleteItemServlet extends HttpServlet { private static Logger log = Logger.getLogger(CompleteItemServlet.class); - private IResourceService service; + @Autowired + private IResourceService resourceService; + /* + * Request Spring to lookup the applicationContext tied to the current ServletContext and inject service beans + * available in that applicationContext. + */ @Override - public void init() throws ServletException { - service = ResourceServiceProxy.getResourceService(getServletContext()); - super.init(); + public void init(ServletConfig config) throws ServletException { + super.init(config); + SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this, config.getServletContext()); } /** @@ -85,7 +92,7 @@ UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); Long sessionId = (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_SESSION_ID); - service.setItemComplete(resourceItemUid, new Long(user.getUserID().intValue()), sessionId); + resourceService.setItemComplete(resourceItemUid, new Long(user.getUserID().intValue()), sessionId); // set resource item complete tag SortedSet resourceItemList = getResourceItemList(sessionMap); Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/AuthoringController.java =================================================================== diff -u -rf19ab367a5ab1ed3fc40b7d1d29defc861a986fd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f19ab367a5ab1ed3fc40b7d1d29defc861a986fd) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -39,7 +39,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -48,11 +47,9 @@ @Controller @RequestMapping("/authoring") public class AuthoringController { - private static Logger logger = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("leaderselectionService") private ILeaderselectionService leaderselectionService; // Authoring SessionMap key names Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java =================================================================== diff -u -r2b381314f275480d99d5487ab8827fdf4ed0c1e5 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java (.../LearningController.java) (revision 2b381314f275480d99d5487ab8827fdf4ed0c1e5) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -46,22 +46,17 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.context.WebApplicationContext; -/** - * - */ @Controller @RequestMapping("/learning") public class LearningController { private static Logger log = Logger.getLogger(LearningController.class); @Autowired - @Qualifier("leaderselectionService") private ILeaderselectionService leaderselectionService; @Autowired Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -37,24 +37,15 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -/** - * - * - * - * - */ @Controller @RequestMapping("/monitoring") public class MonitoringController { - private static Logger log = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("leaderselectionService") private ILeaderselectionService leaderselectionService; @RequestMapping(value = "") Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java =================================================================== diff -u -re24d6ed72c977828fd089bf2bc718ca4a8328f26 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -11,8 +11,6 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -23,11 +21,9 @@ @Controller @RequestMapping("/TblMonitoring") public class TblMonitoringController { - private static Logger log = Logger.getLogger(TblMonitoringController.class); @Autowired - @Qualifier(value = "leaderselectionService") private ILeaderselectionService leaderselectionService; /** Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -58,16 +58,10 @@ /** * @author Ruslan Kazakov - * @version 1.0.1 - * - * - * - * */ @Controller @RequestMapping("/authoring") public class AuthoringController { - private static Logger logger = Logger.getLogger(AuthoringController.class); // Authoring SessionMap key names @@ -76,9 +70,8 @@ private static final String KEY_MODE = "mode"; @Autowired - @Qualifier("mindmapService") private IMindmapService mindmapService; - + @Autowired @Qualifier("mindmapMessageService") private MessageService messageService; Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java =================================================================== diff -u -r2b381314f275480d99d5487ab8827fdf4ed0c1e5 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java (.../LearningController.java) (revision 2b381314f275480d99d5487ab8827fdf4ed0c1e5) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -92,7 +92,6 @@ private static final String REQUEST_JSON_PARENT_NODE_ID = "parentId"; // Expected to be long @Autowired - @Qualifier("mindmapService") private IMindmapService mindmapService; @Autowired Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java =================================================================== diff -u -rf23f6693e999a16730433009b95264fa8af9e1a8 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f23f6693e999a16730433009b95264fa8af9e1a8) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -46,29 +46,20 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; /** * @author Ruslan Kazakov - * @version 1.0.1 - * - * - * - * - * */ @Controller @RequestMapping("/monitoring") public class MonitoringController { - private static Logger log = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("mindmapService") private IMindmapService mindmapService; /** Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/PedagogicalPlannerController.java =================================================================== diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision ebe9a494826fab1aebb345e6801ad512abb52416) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -42,23 +42,12 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -/** - * @author - * @version - * - * - * - * - * - */ @Controller @RequestMapping("/pedagogicalPlanner") public class PedagogicalPlannerController { - private static Logger logger = Logger.getLogger(PedagogicalPlannerController.class); @Autowired - @Qualifier("mindmapService") private IMindmapService mindmapService; @Autowired Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbAuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbAuthoringController.java (.../NbAuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbAuthoringController.java (.../NbAuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -74,7 +74,6 @@ public final static String FORM = "NbAuthoringForm"; @Autowired - @Qualifier("nbService") private INoticeboardService nbService; @Autowired Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java (.../NbLearnerController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java (.../NbLearnerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -81,7 +81,6 @@ static Logger logger = Logger.getLogger(NbLearnerController.class.getName()); @Autowired - @Qualifier("nbService") private INoticeboardService nbService; @Autowired Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java (.../NbMonitoringController.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java (.../NbMonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -47,11 +47,9 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; /** * The buttons are a switch between tabs and will forward to a jsp and display @@ -62,11 +60,9 @@ @Controller @RequestMapping("/monitoring") public class NbMonitoringController { - static Logger logger = Logger.getLogger(NbMonitoringController.class.getName()); @Autowired - @Qualifier("nbService") private INoticeboardService nbService; public final static String FORM = "NbMonitoringForm"; Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java (.../NbPedagogicalPlannerController.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java (.../NbPedagogicalPlannerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -32,29 +32,17 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -/** - * @author - * @version - * - * - * - * - * - */ @Controller @RequestMapping("/pedagogicalPlanner") public class NbPedagogicalPlannerController { - private static Logger logger = Logger.getLogger(NbPedagogicalPlannerController.class); @Autowired - @Qualifier("nbService") private INoticeboardService nbService; protected String unspecified(@ModelAttribute NbPedagogicalPlannerForm plannerForm, HttpServletRequest request) { Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -45,28 +45,17 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -/** - * @author - * @version - * - * - * - * - */ @Controller @RequestMapping("/authoring") public class AuthoringController { - private static Logger logger = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("notebookService") private INotebookService notebookService; // Authoring SessionMap key names Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java =================================================================== diff -u -r2b381314f275480d99d5487ab8827fdf4ed0c1e5 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java (.../LearningController.java) (revision 2b381314f275480d99d5487ab8827fdf4ed0c1e5) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -53,26 +53,20 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.context.WebApplicationContext; -/** - */ @Controller @RequestMapping("/learning") public class LearningController { - private static Logger log = Logger.getLogger(LearningController.class); private static final boolean MODE_OPTIONAL = false; @Autowired - @Qualifier("notebookService") private INotebookService notebookService; - @Autowired private WebApplicationContext applicationContext; Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -61,7 +61,6 @@ private static String noEntryText = null; // access via getNoEntryText() @Autowired - @Qualifier("notebookService") private INotebookService notebookService; @Autowired Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -34,35 +34,20 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -/** - * @author - * @version - * - * - * - * - * - */ @Controller @RequestMapping("/pedagogicalPlanner") public class PedagogicalPlannerController { - private static Logger logger = Logger.getLogger(PedagogicalPlannerController.class); @Autowired - @Qualifier("notebookService") private INotebookService notebookService; @RequestMapping(value = "", method = RequestMethod.POST) protected String unspecified(NotebookPedagogicalPlannerForm pedagogicalPlannerForm, HttpServletRequest request) { -// if (notebookService == null) { -// notebookService = NotebookServiceProxy.getNotebookService(this.getServlet().getServletContext()); -// } return initPedagogicalPlannerForm(pedagogicalPlannerForm, request); } Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java =================================================================== diff -u -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -57,16 +57,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.multipart.MultipartFile; -/** - */ @Controller @RequestMapping("/authoring") public class AuthoringController { - private static Logger logger = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("pixlrService") private IPixlrService pixlrService; @Autowired Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java =================================================================== diff -u -r2b381314f275480d99d5487ab8827fdf4ed0c1e5 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 2b381314f275480d99d5487ab8827fdf4ed0c1e5) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -44,7 +44,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -61,7 +60,6 @@ private Logger log = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("submitFilesService") private ISubmitFilesService submitFilesService; /** Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java =================================================================== diff -u -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java (.../LearnerController.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java (.../LearnerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -86,7 +86,6 @@ public static Logger logger = Logger.getLogger(LearnerController.class); @Autowired - @Qualifier("submitFilesService") private ISubmitFilesService submitFilesService; @Autowired Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MarkController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MarkController.java (.../MarkController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MarkController.java (.../MarkController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -56,7 +56,6 @@ public class MarkController { @Autowired - @Qualifier("submitFilesService") private ISubmitFilesService submitFilesService; @Autowired Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -81,11 +81,9 @@ @Controller @RequestMapping("/monitoring") public class MonitoringController { - public static Logger logger = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("submitFilesService") private ISubmitFilesService submitFilesService; @Autowired Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java (.../SubmitFilesPedagogicalPlannerController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java (.../SubmitFilesPedagogicalPlannerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -37,16 +37,12 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -/** - */ @Controller @RequestMapping("/pedagogicalPlanner") public class SubmitFilesPedagogicalPlannerController { - private static Logger logger = Logger.getLogger(SubmitFilesPedagogicalPlannerController.class); @Autowired - @Qualifier("submitFilesService") private ISubmitFilesService submitFilesService; protected String unspecified(SubmitFilesPedagogicalPlannerForm plannerForm, HttpServletRequest request) { Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AdminController.java =================================================================== diff -u -r22cca1a815f7aee530e14ab87b7744f381d03ac1 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AdminController.java (.../AdminController.java) (revision 22cca1a815f7aee530e14ab87b7744f381d03ac1) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AdminController.java (.../AdminController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -48,14 +48,12 @@ public class AdminController { @Autowired - @Qualifier("scratchieService") private IScratchieService scratchieService; @Autowired @Qualifier("scratchieMessageService") private MessageService messageService; - @RequestMapping("/start") public String start(@ModelAttribute("scratchieAdminForm") AdminForm scratchieAdminForm, HttpServletRequest request) { Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -87,7 +87,6 @@ private static Logger log = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("scratchieService") private IScratchieService scratchieService; @Autowired Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java =================================================================== diff -u -r1061286825c95ff76c63c5f081be60e88a8a1da2 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java (.../LearningController.java) (revision 1061286825c95ff76c63c5f081be60e88a8a1da2) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -69,7 +69,6 @@ import org.lamsfoundation.lams.web.util.SessionMap; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -89,7 +88,6 @@ private static Logger log = Logger.getLogger(LearningController.class); @Autowired - @Qualifier("scratchieService") private IScratchieService scratchieService; @Autowired Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java =================================================================== diff -u -r22cca1a815f7aee530e14ab87b7744f381d03ac1 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 22cca1a815f7aee530e14ab87b7744f381d03ac1) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -61,7 +61,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -74,7 +73,6 @@ public static Logger log = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("scratchieService") private IScratchieService scratchieService; @RequestMapping("/summary") Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java (.../TblMonitorController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java (.../TblMonitorController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -60,7 +60,6 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -74,7 +73,6 @@ private static Logger log = Logger.getLogger(TblMonitorController.class); @Autowired - @Qualifier("scratchieService") private IScratchieService scratchieService; /** Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/PopulateMarksServlet.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/PopulateMarksServlet.java (.../PopulateMarksServlet.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/PopulateMarksServlet.java (.../PopulateMarksServlet.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -38,26 +39,27 @@ import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser; import org.lamsfoundation.lams.tool.scratchie.service.IScratchieService; -import org.lamsfoundation.lams.tool.scratchie.service.ScratchieServiceProxy; import org.lamsfoundation.lams.util.WebUtil; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.context.support.SpringBeanAutowiringSupport; public class PopulateMarksServlet extends HttpServlet { private static Logger log = Logger.getLogger(PopulateMarksServlet.class); - private static IScratchieService service; + @Autowired + private static IScratchieService scratchieService; + @Autowired private static ScratchieSessionDAO scratchieSessionDAO; + /* + * Request Spring to lookup the applicationContext tied to the current ServletContext and inject service beans + * available in that applicationContext. + */ @Override - public void init() throws ServletException { - PopulateMarksServlet.service = ScratchieServiceProxy.getScratchieService(getServletContext()); - - WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext()); - PopulateMarksServlet.scratchieSessionDAO = (ScratchieSessionDAO) ctx.getBean("scratchieSessionDao"); - - super.init(); + public void init(ServletConfig config) throws ServletException { + super.init(config); + SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this, config.getServletContext()); } /* @@ -79,7 +81,7 @@ if (toolContentId == null) { for (int i = 1; i < 20000; i++) { - ScratchieSession session = service.getScratchieSessionBySessionId(new Long(i)); + ScratchieSession session = scratchieService.getScratchieSessionBySessionId(new Long(i)); if (session != null) { sessions.add(session); @@ -98,7 +100,7 @@ ScratchieUser leader = session.getGroupLeader(); if ((leader != null)) { - service.recalculateMarkForSession(session.getSessionId(), true); + scratchieService.recalculateMarkForSession(session.getSessionId(), true); log.debug("recalculateMarkForSession uid:" + session.getUid()); out.println("recalculateMarkForSession uid:" + session.getUid()); } Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/controller/LearningController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/controller/LearningController.java (.../LearningController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -42,7 +42,6 @@ public class LearningController { @Autowired - @Qualifier("learnerService") private ILearnerService learnerService; @RequestMapping("") Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -67,7 +67,6 @@ private static Logger logger = Logger.getLogger(AuthoringController.class.getName()); @Autowired - @Qualifier("voteService") private IVoteService voteService; @Autowired Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -89,7 +89,6 @@ private MessageService messageService; @Autowired - @Qualifier("voteService") private IVoteService voteService; @RequestMapping("/viewAllResults") Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java =================================================================== diff -u -re24d6ed72c977828fd089bf2bc718ca4a8328f26 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java (.../MonitoringController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -56,7 +56,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -76,7 +75,6 @@ private static Logger logger = Logger.getLogger(MonitoringController.class.getName()); @Autowired - @Qualifier("voteService") private IVoteService voteService; @RequestMapping(path = "/hideOpenVote") Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VoteChartGeneratorController.java =================================================================== diff -u -re24d6ed72c977828fd089bf2bc718ca4a8328f26 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VoteChartGeneratorController.java (.../VoteChartGeneratorController.java) (revision e24d6ed72c977828fd089bf2bc718ca4a8328f26) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VoteChartGeneratorController.java (.../VoteChartGeneratorController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -39,8 +39,6 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -56,7 +54,6 @@ @Controller public class VoteChartGeneratorController { @Autowired - @Qualifier("voteService") private IVoteService voteService; @RequestMapping(path = "/chartGenerator") Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VotePedagogicalPlannerController.java =================================================================== diff -u -r8bc11142a6db14da1d00d3fd8adfe7d4938ead15 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VotePedagogicalPlannerController.java (.../VotePedagogicalPlannerController.java) (revision 8bc11142a6db14da1d00d3fd8adfe7d4938ead15) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VotePedagogicalPlannerController.java (.../VotePedagogicalPlannerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -43,7 +43,6 @@ @RequestMapping("/pedagogicalPlanner") public class VotePedagogicalPlannerController { @Autowired - @Qualifier("voteService") private IVoteService voteService; @Autowired Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/AuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -46,7 +46,6 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -62,11 +61,9 @@ @Controller @RequestMapping("/authoring") public class AuthoringController extends WikiPageController { - private static Logger logger = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("wikiService") private IWikiService wikiService; // Authoring SessionMap key names Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/LearningController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/LearningController.java (.../LearningController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -60,7 +60,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -73,28 +72,16 @@ * * * @author lfoxton - * @version - * - * - * - * - * - * - * - * */ @Controller @RequestMapping("/learning") public class LearningController extends WikiPageController { - private static Logger log = Logger.getLogger(LearningController.class); private static final boolean MODE_OPTIONAL = false; @Autowired - @Qualifier("wikiService") private IWikiService wikiService; - @Autowired private WebApplicationContext applicationContext; Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/MonitoringController.java =================================================================== diff -u -r550e1b37b507779064955267ef47e9085f791357 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 550e1b37b507779064955267ef47e9085f791357) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -56,7 +56,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; @@ -74,11 +73,9 @@ @Controller @RequestMapping("/monitoring") public class MonitoringController extends WikiPageController { - private static Logger log = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("wikiService") private IWikiService wikiService; /** Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/PedagogicalPlannerController.java =================================================================== diff -u -rd0a8679bc756e47321aff67f3ed1eb737b8535ff -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision d0a8679bc756e47321aff67f3ed1eb737b8535ff) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -35,19 +35,13 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; /** * @author Marcin Cieslak - * - * - * - * - * */ @Controller @RequestMapping("/pedagogicalPlanner") @@ -56,7 +50,6 @@ private static Logger logger = Logger.getLogger(PedagogicalPlannerController.class); @Autowired - @Qualifier("wikiService") private IWikiService wikiService; @RequestMapping("/initPedagogicalPlannerForm") Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/WikiPageController.java =================================================================== diff -u -rc6221c2f0d3175c3d6fa934a680047845a44d6f4 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/WikiPageController.java (.../WikiPageController.java) (revision c6221c2f0d3175c3d6fa934a680047845a44d6f4) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/WikiPageController.java (.../WikiPageController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -50,10 +50,7 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.ServletRequestDataBinder; -import org.springframework.web.context.WebApplicationContext; /** * An abstract class used for wiki actions common to monitor, learner and author @@ -67,12 +64,8 @@ private static Logger logger = Logger.getLogger(AuthoringController.class); @Autowired - @Qualifier("wikiService") private IWikiService wikiService; - @Autowired - private WebApplicationContext applicationContext; - protected abstract WikiUser getCurrentUser(Long toolSessionId); /** Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/controller/LearningController.java =================================================================== diff -u -rec39d1ee6a4b7b3a709058eb39777c872e1b5c97 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/controller/LearningController.java (.../LearningController.java) (revision ec39d1ee6a4b7b3a709058eb39777c872e1b5c97) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -43,17 +43,14 @@ public class LearningController { @Autowired - private WebApplicationContext applicationContext; + private ILearnerService learnerService; @RequestMapping("") public String unspecified(HttpServletRequest request) throws Exception { HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); - WebApplicationContext wac = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - ILearnerService learnerService = (ILearnerService) wac.getBean("learnerService"); String finishURL = learnerService.completeToolSession(toolSessionId, user.getUserID().longValue()); return "index"; } Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AdminController.java =================================================================== diff -u -rcd28f26327e5afe5f9797847d801eba0abab9144 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AdminController.java (.../AdminController.java) (revision cd28f26327e5afe5f9797847d801eba0abab9144) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AdminController.java (.../AdminController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -50,7 +50,6 @@ private static final Logger logger = Logger.getLogger(AdminController.class); @Autowired - @Qualifier("zoomService") private IZoomService zoomService; @Autowired Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java =================================================================== diff -u -rcd28f26327e5afe5f9797847d801eba0abab9144 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java (.../AuthoringController.java) (revision cd28f26327e5afe5f9797847d801eba0abab9144) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -54,7 +54,6 @@ public class AuthoringController { @Autowired - @Qualifier("zoomService") private IZoomService zoomService; @Autowired Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java =================================================================== diff -u -rcd28f26327e5afe5f9797847d801eba0abab9144 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java (.../LearningController.java) (revision cd28f26327e5afe5f9797847d801eba0abab9144) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -63,7 +63,6 @@ private static final Logger logger = Logger.getLogger(LearningController.class); @Autowired - @Qualifier("zoomService") private IZoomService zoomService; @Autowired Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/MonitoringController.java =================================================================== diff -u -rcd28f26327e5afe5f9797847d801eba0abab9144 -rf2ad75cef0c507a64877942631fee13efbc6ed50 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/MonitoringController.java (.../MonitoringController.java) (revision cd28f26327e5afe5f9797847d801eba0abab9144) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) @@ -51,7 +51,6 @@ private static final Logger logger = Logger.getLogger(MonitoringController.class); @Autowired - @Qualifier("zoomService") private IZoomService zoomService; @Autowired