Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java =================================================================== diff -u -r78b847b4a5962e1c3d0167cfdc0f95137be57e6a -rf924f6c36faa889dcf00d5d9827ab0669c6d4add --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java (.../ConfigController.java) (revision 78b847b4a5962e1c3d0167cfdc0f95137be57e6a) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java (.../ConfigController.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) @@ -29,6 +29,7 @@ import javax.servlet.http.HttpSession; import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; import org.lamsfoundation.lams.admin.web.form.ConfigForm; import org.lamsfoundation.lams.config.ConfigurationItem; import org.lamsfoundation.lams.logevent.LogEvent; @@ -53,6 +54,7 @@ */ @Controller public class ConfigController { + private static Logger log = Logger.getLogger(ConfigController.class); @Autowired private Configuration configuration; @@ -134,6 +136,7 @@ String changeLogString = changeLog.insert(0, "Configuration changed: ").substring(0, changeLog.length() - 2); logEventService.logEvent(LogEvent.TYPE_CONFIG_CHANGE, getUserId(), null, null, null, changeLogString); + ConfigController.log.warn(changeLogString + " by UserId : " + getUserId()); } Configuration.refreshCache(); @@ -158,4 +161,4 @@ UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); return user != null ? user.getUserID() : null; } -} \ No newline at end of file +} Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java =================================================================== diff -u -r1840d1ada2e0a7dc494e83ed0c183f6c98b6da92 -rf924f6c36faa889dcf00d5d9827ab0669c6d4add --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java (.../ExtServerManagementController.java) (revision 1840d1ada2e0a7dc494e83ed0c183f6c98b6da92) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java (.../ExtServerManagementController.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) @@ -30,6 +30,7 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; import org.lamsfoundation.lams.admin.web.form.ExtServerForm; import org.lamsfoundation.lams.integration.ExtServer; import org.lamsfoundation.lams.integration.service.IIntegrationService; @@ -52,6 +53,7 @@ @Controller @RequestMapping("/extserver") public class ExtServerManagementController { + private static Logger log = Logger.getLogger(ExtServerManagementController.class); @Autowired private IIntegrationService integrationService; @@ -140,18 +142,23 @@ } } + String extServerStatus; if (errorMap.isEmpty()) { ExtServer map = null; if (sid.equals(-1)) { map = new ExtServer(); BeanUtils.copyProperties(map, extServerForm); map.setSid(null); map.setServerTypeId(ExtServer.INTEGRATION_SERVER_TYPE); + extServerStatus = "added"; + // ExtServerManagementController.log.warn("Integration server added! key: " + extServerForm.getServerkey() + " name: " + extServerForm.getServername()); } else { map = integrationService.getExtServer(sid); BeanUtils.copyProperties(map, extServerForm); + extServerStatus = "updated"; } integrationService.saveExtServer(map); + ExtServerManagementController.log.warn("Integration server " + extServerStatus + "! key: " + extServerForm.getServerkey() + " name: " + extServerForm.getServername()); return "forward:/extserver/serverlist.do"; } else { request.setAttribute("errorMap", errorMap); @@ -165,6 +172,7 @@ ExtServer map = integrationService.getExtServer(sid); map.setDisabled(true); integrationService.saveExtServer(map); + ExtServerManagementController.log.warn("Integration server disabled! key: " + map.getServerkey()); return "redirect:/extserver/serverlist.do"; } @@ -174,12 +182,15 @@ ExtServer map = integrationService.getExtServer(sid); map.setDisabled(false); integrationService.saveExtServer(map); + ExtServerManagementController.log.warn("Integration server enabled! key: " + map.getServerkey()); return "redirect:/extserver/serverlist.do"; } @RequestMapping(path = "/delete", method = RequestMethod.POST) public String delete(HttpServletRequest request) throws Exception { Integer sid = WebUtil.readIntParam(request, "sid", false); + ExtServer map = integrationService.getExtServer(sid); + ExtServerManagementController.log.warn("Integration server deleted! key: " + map.getServerkey()); userManagementService.deleteById(ExtServer.class, sid); return "redirect:/extserver/serverlist.do"; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java =================================================================== diff -u -r8d8232ae7142c30068360a2a41bbcccc065e775b -rf924f6c36faa889dcf00d5d9827ab0669c6d4add --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java (.../LoginSaveController.java) (revision 8d8232ae7142c30068360a2a41bbcccc065e775b) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java (.../LoginSaveController.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) @@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.log4j.Logger; import org.lamsfoundation.lams.admin.web.form.LoginMaintainForm; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; @@ -46,6 +47,7 @@ */ @Controller public class LoginSaveController { + private static Logger log = Logger.getLogger(LoginSaveController.class); private static final String NEWS_PAGE_PATH_SUFFIX = File.separatorChar + "lams-www.war" + File.separatorChar + "news.html"; @@ -61,6 +63,7 @@ bWriter = new BufferedWriter(ow); bWriter.write(loginMaintainForm.getNews()); bWriter.flush(); + LoginSaveController.log.warn("Login Page changed!"); } finally { if (bWriter != null) { bWriter.close(); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java =================================================================== diff -u -r7808273ba3a006d130a995d8561b37ef54df712e -rf924f6c36faa889dcf00d5d9827ab0669c6d4add --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java (.../LtiConsumerManagementController.java) (revision 7808273ba3a006d130a995d8561b37ef54df712e) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java (.../LtiConsumerManagementController.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) @@ -124,6 +124,7 @@ ExtServer ltiConsumer = integrationService.getExtServer(sid); ltiConsumer.setDisabled(disable); integrationService.saveExtServer(ltiConsumer); + LtiConsumerManagementController.log.warn("LTI integration disabled! Sid: " + sid ); return start(request); } @@ -135,6 +136,7 @@ public String delete(HttpServletRequest request) throws Exception { Integer sid = WebUtil.readIntParam(request, "sid", true); userManagementService.deleteById(ExtServer.class, sid); + LtiConsumerManagementController.log.warn("LTI integration deleted! Sid: " + sid ); return start(request); } @@ -198,6 +200,7 @@ } } + String extServerStatus; if (errorMap.isEmpty()) { ExtServer ltiConsumer = null; if (sid.equals(-1)) { @@ -206,10 +209,12 @@ ltiConsumer.setSid(null); ltiConsumer.setServerTypeId(ExtServer.LTI_CONSUMER_SERVER_TYPE); ltiConsumer.setUserinfoUrl("blank"); + extServerStatus = "added"; } else { ltiConsumer = integrationService.getExtServer(sid); BeanUtils.copyProperties(ltiConsumer, ltiConsumerForm); + extServerStatus = "updated"; } ltiConsumer.setTimeToLiveLoginRequestEnabled(false); @@ -218,6 +223,8 @@ ltiConsumer.setDefaultLocale(locale); integrationService.saveExtServer(ltiConsumer); + LtiConsumerManagementController.log.warn("LTI integration " + extServerStatus + "! ServerName: " + ltiConsumerForm.getServerkey() ); + return start(request); } else { Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java =================================================================== diff -u -r1840d1ada2e0a7dc494e83ed0c183f6c98b6da92 -rf924f6c36faa889dcf00d5d9827ab0669c6d4add --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java (.../SignupManagementController.java) (revision 1840d1ada2e0a7dc494e83ed0c183f6c98b6da92) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java (.../SignupManagementController.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) @@ -121,6 +121,7 @@ signup.setBlurb(signupForm.getBlurb()); signup.setContext(signupForm.getContext()); userManagementService.save(signup); + SignupManagementController.log.warn("Signup page added/updated! Coursekey: " + signupForm.getCourseKey()); return "forward:/signupManagement/start.do"; } @@ -140,6 +141,7 @@ Integer soid = WebUtil.readIntParam(request, "soid"); if (soid != null && soid > 0) { + SignupManagementController.log.warn("Signup page deleted! soid: " + soid); userManagementService.deleteById(SignupOrganisation.class, soid); } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java =================================================================== diff -u -r16c695f2188929b7a0020fc76d71f99e31aeecbf -rf924f6c36faa889dcf00d5d9827ab0669c6d4add --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java (.../TimezoneManagementController.java) (revision 16c695f2188929b7a0020fc76d71f99e31aeecbf) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java (.../TimezoneManagementController.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) @@ -23,7 +23,7 @@ package org.lamsfoundation.lams.admin.web.controller; import java.util.ArrayList; - +import org.apache.log4j.Logger; import org.lamsfoundation.lams.timezone.Timezone; import org.lamsfoundation.lams.timezone.dto.TimezoneDTO; import org.lamsfoundation.lams.timezone.service.ITimezoneService; @@ -41,6 +41,7 @@ @Controller @RequestMapping("/timezonemanagement") public class TimezoneManagementController { + private static Logger log = Logger.getLogger(TimezoneManagementController.class); @Autowired private ITimezoneService timezoneService; @@ -69,7 +70,8 @@ @RequestMapping(path = "/changeServerTimezone") public String changeServerTimezone(@RequestParam String serverTimezone) throws Exception { timezoneService.setServerTimezone(serverTimezone); + TimezoneManagementController.log.warn("Server timezone changed!"); return "forward:start.do?saved=true"; } -} \ No newline at end of file +} Index: lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java =================================================================== diff -u -rf6e4b23dd202a5fd3cc57e3871397934f85f6dc9 -rf924f6c36faa889dcf00d5d9827ab0669c6d4add --- lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java (.../UniversalLoginModule.java) (revision f6e4b23dd202a5fd3cc57e3871397934f85f6dc9) +++ lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java (.../UniversalLoginModule.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) @@ -201,7 +201,7 @@ if (!validatePassword(password)) { if (UniversalLoginModule.log.isDebugEnabled()) { - UniversalLoginModule.log.debug("Bad password for user: " + userName); + UniversalLoginModule.log.info("Bad password for user: " + userName); } throw new FailedLoginException("Incorrect password"); } @@ -521,4 +521,4 @@ public static void setAuthenticationToken(String token) { UniversalLoginModule.internalAuthenticationTokens.put(token, System.currentTimeMillis()); } -} \ No newline at end of file +}