Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java =================================================================== diff -u -rf924f6c36faa889dcf00d5d9827ab0669c6d4add -rc4e36699eb3bd56b59e196872bf4fb46b9f3730c --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java (.../ConfigController.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java (.../ConfigController.java) (revision c4e36699eb3bd56b59e196872bf4fb46b9f3730c) @@ -29,7 +29,6 @@ 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; @@ -54,7 +53,6 @@ */ @Controller public class ConfigController { - private static Logger log = Logger.getLogger(ConfigController.class); @Autowired private Configuration configuration; @@ -136,7 +134,6 @@ 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(); @@ -161,4 +158,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 -rf924f6c36faa889dcf00d5d9827ab0669c6d4add -rc4e36699eb3bd56b59e196872bf4fb46b9f3730c --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java (.../ExtServerManagementController.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java (.../ExtServerManagementController.java) (revision c4e36699eb3bd56b59e196872bf4fb46b9f3730c) @@ -30,7 +30,6 @@ 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; @@ -53,7 +52,6 @@ @Controller @RequestMapping("/extserver") public class ExtServerManagementController { - private static Logger log = Logger.getLogger(ExtServerManagementController.class); @Autowired private IIntegrationService integrationService; @@ -142,23 +140,18 @@ } } - 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); @@ -172,7 +165,6 @@ 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"; } @@ -182,15 +174,12 @@ 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 -rf924f6c36faa889dcf00d5d9827ab0669c6d4add -rc4e36699eb3bd56b59e196872bf4fb46b9f3730c --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java (.../LoginSaveController.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java (.../LoginSaveController.java) (revision c4e36699eb3bd56b59e196872bf4fb46b9f3730c) @@ -32,7 +32,6 @@ 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; @@ -47,7 +46,6 @@ */ @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"; @@ -63,7 +61,6 @@ 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 -rf924f6c36faa889dcf00d5d9827ab0669c6d4add -rc4e36699eb3bd56b59e196872bf4fb46b9f3730c --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java (.../LtiConsumerManagementController.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java (.../LtiConsumerManagementController.java) (revision c4e36699eb3bd56b59e196872bf4fb46b9f3730c) @@ -124,7 +124,6 @@ ExtServer ltiConsumer = integrationService.getExtServer(sid); ltiConsumer.setDisabled(disable); integrationService.saveExtServer(ltiConsumer); - LtiConsumerManagementController.log.warn("LTI integration disabled! Sid: " + sid ); return start(request); } @@ -136,7 +135,6 @@ 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); } @@ -200,7 +198,6 @@ } } - String extServerStatus; if (errorMap.isEmpty()) { ExtServer ltiConsumer = null; if (sid.equals(-1)) { @@ -209,12 +206,10 @@ 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); @@ -223,8 +218,6 @@ 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 -rf924f6c36faa889dcf00d5d9827ab0669c6d4add -rc4e36699eb3bd56b59e196872bf4fb46b9f3730c --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java (.../SignupManagementController.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java (.../SignupManagementController.java) (revision c4e36699eb3bd56b59e196872bf4fb46b9f3730c) @@ -121,7 +121,6 @@ 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"; } @@ -141,7 +140,6 @@ 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 -rf924f6c36faa889dcf00d5d9827ab0669c6d4add -rc4e36699eb3bd56b59e196872bf4fb46b9f3730c --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java (.../TimezoneManagementController.java) (revision f924f6c36faa889dcf00d5d9827ab0669c6d4add) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java (.../TimezoneManagementController.java) (revision c4e36699eb3bd56b59e196872bf4fb46b9f3730c) @@ -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,7 +41,6 @@ @Controller @RequestMapping("/timezonemanagement") public class TimezoneManagementController { - private static Logger log = Logger.getLogger(TimezoneManagementController.class); @Autowired private ITimezoneService timezoneService; @@ -70,8 +69,7 @@ @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