Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/MonitoringController.java =================================================================== diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -rf23f6693e999a16730433009b95264fa8af9e1a8 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f23f6693e999a16730433009b95264fa8af9e1a8) @@ -232,7 +232,7 @@ /** * Set Submission Deadline */ - @RequestMapping(path = "setSubmissionDeadline", produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(path = "/setSubmissionDeadline", produces = MediaType.TEXT_PLAIN_VALUE) @ResponseBody public String setSubmissionDeadline(HttpServletRequest request, HttpServletResponse response) throws IOException { Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java =================================================================== diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -rf23f6693e999a16730433009b95264fa8af9e1a8 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java (.../AuthoringController.java) (revision ebe9a494826fab1aebb345e6801ad512abb52416) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f23f6693e999a16730433009b95264fa8af9e1a8) @@ -48,7 +48,6 @@ 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.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -147,7 +146,7 @@ /** * Returns the serialized XML of the Mindmap Nodes from Database */ - @RequestMapping(path = "/setMindmapContentJSON", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping("/setMindmapContentJSON") @ResponseBody public String setMindmapContentJSON(HttpServletRequest request, HttpServletResponse response) throws IOException { @@ -166,7 +165,7 @@ ObjectNode jsonObject = JsonNodeFactory.instance.objectNode(); jsonObject.set("mindmap", new RootJSON(currentNodeModel, false)); - + response.setContentType("application/json;charset=UTF-8"); return jsonObject.toString(); } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java =================================================================== diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -rf23f6693e999a16730433009b95264fa8af9e1a8 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java (.../LearningController.java) (revision ebe9a494826fab1aebb345e6801ad512abb52416) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java (.../LearningController.java) (revision f23f6693e999a16730433009b95264fa8af9e1a8) @@ -69,7 +69,6 @@ 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; import org.springframework.web.bind.annotation.RequestMapping; @@ -269,7 +268,7 @@ /** * Gets the Notify Requests (Actions) from Flash and returns proper Notify Responses */ - @RequestMapping(path = "/notifyServerActionJSON", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping("/notifyServerActionJSON") @ResponseBody public String notifyServerActionJSON(HttpServletRequest request, HttpServletResponse response) throws JsonProcessingException, IOException { @@ -396,7 +395,7 @@ notifyResponse = new NotifyResponseJSON(1, mindmapRequest.getGlobalId(), null); } } - + response.setContentType("application/json;charset=UTF-8"); return notifyResponse.toString(); } @@ -421,7 +420,7 @@ /** * Returns the serialized JSON of the Mindmap Nodes from Database */ - @RequestMapping(path = "/setMindmapContentJSON", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping("/setMindmapContentJSON") @ResponseBody public String setMindmapContentJSON(HttpServletRequest request, HttpServletResponse response) throws IOException { @@ -478,13 +477,13 @@ Long lastActionId = mindmapService.getLastGlobalIdByMindmapId(mindmap.getUid(), toolSessionId); jsonObject.put("lastActionId", lastActionId); } - + response.setContentType("application/json;charset=UTF-8"); return jsonObject.toString(); } return null; } - @RequestMapping(path = "/saveLastMindmapChanges", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping("/saveLastMindmapChanges") @ResponseBody public String saveLastMindmapChanges(HttpServletRequest request, HttpServletResponse response) throws IOException { @@ -505,7 +504,7 @@ } else { responseJSON = new NotifyResponseJSON(0, null, 0L); } - + response.setContentType("application/json;charset=UTF-8"); return responseJSON.toString(); } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java =================================================================== diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -rf23f6693e999a16730433009b95264fa8af9e1a8 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java (.../MonitoringController.java) (revision ebe9a494826fab1aebb345e6801ad512abb52416) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f23f6693e999a16730433009b95264fa8af9e1a8) @@ -162,7 +162,7 @@ /** * Set Submission Deadline */ - @RequestMapping(path = "setSubmissionDeadline", produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(path = "/setSubmissionDeadline", produces = MediaType.TEXT_PLAIN_VALUE) @ResponseBody public String setSubmissionDeadline(HttpServletRequest request, HttpServletResponse response) throws IOException { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf23f6693e999a16730433009b95264fa8af9e1a8 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f23f6693e999a16730433009b95264fa8af9e1a8) @@ -161,7 +161,7 @@ } /** Ajax call to populate the tablesorter */ - @RequestMapping(path = "/getUsers", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping("/getUsers") @ResponseBody public String getUsers(HttpServletRequest request, HttpServletResponse response) { @@ -231,6 +231,7 @@ } responsedata.set("rows", rows); + response.setContentType("application/json;charset=UTF-8"); return responsedata.toString(); @@ -393,7 +394,7 @@ /** * Set Submission Deadline */ - @RequestMapping(path = "setSubmissionDeadline", produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(path = "/setSubmissionDeadline", produces = MediaType.TEXT_PLAIN_VALUE) @ResponseBody public String setSubmissionDeadline(HttpServletRequest request, HttpServletResponse response) throws IOException { Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/MonitoringController.java =================================================================== diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -rf23f6693e999a16730433009b95264fa8af9e1a8 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f23f6693e999a16730433009b95264fa8af9e1a8) @@ -53,7 +53,6 @@ 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.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -108,7 +107,7 @@ return "pages/monitoring/monitoring"; } - @RequestMapping(path = "/getUsers", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping("/getUsers") @ResponseBody public String getUsers(HttpServletRequest request, HttpServletResponse response) throws IOException { @@ -164,7 +163,7 @@ rows.add(responseRow); } responsedata.set("rows", rows); - + response.setContentType("application/json;charset=UTF-8"); return responsedata.toString(); } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rf23f6693e999a16730433009b95264fa8af9e1a8 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f23f6693e999a16730433009b95264fa8af9e1a8) @@ -167,7 +167,7 @@ /** * Refreshes user list. */ - @RequestMapping(path = "/getPagedUsers", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping("/getPagedUsers") @ResponseBody public String getPagedUsers(HttpServletRequest request, HttpServletResponse res) { @@ -246,16 +246,16 @@ responseJSON.put("page", page); responseJSON.put("records", countSessionUsers); responseJSON.set("rows", rows); - + res.setContentType("application/json;charset=UTF-8"); return responseJSON.toString(); } /** * Refreshes user list. */ - @RequestMapping(path = "/getPagedUsersByItem", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @RequestMapping("/getPagedUsersByItem") @ResponseBody - public String getPagedUsersByItem(HttpServletRequest request) { + public String getPagedUsersByItem(HttpServletRequest request, HttpServletResponse response) { Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); Long itemUid = WebUtil.readLongParam(request, TaskListConstants.PARAM_ITEM_UID); @@ -374,7 +374,7 @@ responseJSON.put("page", page); responseJSON.put("records", countSessionUsers); responseJSON.set("rows", rows); - + response.setContentType("application/json;charset=UTF-8"); return responseJSON.toString(); }