Index: lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsAction.java,v diff -u -r1.6 -r1.7 --- lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsAction.java 14 Nov 2012 09:08:21 -0000 1.6 +++ lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsAction.java 23 Nov 2012 11:04:09 -0000 1.7 @@ -137,7 +137,7 @@ jsonArray.put(jsonObject); } - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(jsonArray); return null; @@ -164,4 +164,4 @@ } -} \ No newline at end of file +} Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java,v diff -u -r1.6 -r1.7 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java 14 Nov 2012 09:08:18 -0000 1.6 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java 23 Nov 2012 11:06:15 -0000 1.7 @@ -271,7 +271,7 @@ } } - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(JSONObject); return null; } @@ -316,7 +316,7 @@ cellarray.put(cellobj); } responcedata.put("rows", cellarray); - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(new String(responcedata.toString())); return null; } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v diff -u -r1.77 -r1.78 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 16 Nov 2012 07:52:07 -0000 1.77 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 23 Nov 2012 11:06:58 -0000 1.78 @@ -906,7 +906,7 @@ JSONObject JSONObject = new JSONObject(); JSONObject.put("averageRating", averageRatingDTO.getRating()); JSONObject.put("numberOfVotes", averageRatingDTO.getNumberOfVotes()); - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(JSONObject); return null; } Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java,v diff -u -r1.3 -r1.4 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java 20 Nov 2012 09:40:03 -0000 1.3 +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java 23 Nov 2012 11:07:33 -0000 1.4 @@ -314,7 +314,7 @@ JSONObject JSONObject = new JSONObject(); JSONObject.put(KalturaConstants.PARAM_ITEM_UID, item.getUid()); - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(JSONObject); return null; } @@ -401,7 +401,7 @@ JSONObject JSONObject = new JSONObject(); JSONObject.put("averageRating", averageRatingDto.getRating()); JSONObject.put("numberOfVotes", averageRatingDto.getNumberOfVotes()); - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(JSONObject); return null; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v diff -u -r1.43 -r1.44 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 16 Nov 2012 07:51:01 -0000 1.43 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 23 Nov 2012 11:08:14 -0000 1.44 @@ -730,7 +730,7 @@ JSONObject JSONObject = new JSONObject(); JSONObject.put("averageRating", averageRatingDTO.getRating()); JSONObject.put("numberOfVotes", averageRatingDTO.getNumberOfVotes()); - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(JSONObject); return null; } @@ -983,4 +983,4 @@ return qaService.getUserByIdAndSession(userId, new Long(toolSessionID)); } -} \ No newline at end of file +}