Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -r74280645f86d72ceabada5d340a174c4b10d9d53 --- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 60d9a173d5590295376322fc3e857ae2dca37717) +++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 74280645f86d72ceabada5d340a174c4b10d9d53) @@ -212,192 +212,6 @@ - - STRUTS-textarea - org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag - empty - - accesskey - false - true - - - alt - false - true - - - altKey - false - true - - - bundle - false - true - - - cols - false - true - - - disabled - false - true - - - errorKey - false - true - - - errorStyle - false - true - - - errorStyleClass - false - true - - - errorStyleId - false - true - - - index - false - true - - - indexed - false - true - - - name - false - true - - - onblur - false - true - - - onchange - false - true - - - onclick - false - true - - - ondblclick - false - true - - - onfocus - false - true - - - onkeydown - false - true - - - onkeypress - false - true - - - onkeyup - false - true - - - onmousedown - false - true - - - onmousemove - false - true - - - onmouseout - false - true - - - onmouseover - false - true - - - onmouseup - false - true - - - property - true - true - - - readonly - false - true - - - rows - false - true - - - style - false - true - - - styleClass - false - true - - - styleId - false - true - - - tabindex - false - true - - - title - false - true - - - titleKey - false - true - - - value - false - true - - - Small portrait of a user User Portrait Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java =================================================================== diff -u -rc05d26819a155980f333e1a4aea16afe974119e3 -r74280645f86d72ceabada5d340a174c4b10d9d53 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java (.../AuthoringNotebookConditionController.java) (revision c05d26819a155980f333e1a4aea16afe974119e3) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java (.../AuthoringNotebookConditionController.java) (revision 74280645f86d72ceabada5d340a174c4b10d9d53) @@ -48,6 +48,7 @@ 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; /** * Auxiliary action in author mode. It contains operations with NotebookCondition. The rest of operations are located in @@ -75,7 +76,7 @@ * @param request * @return */ - @RequestMapping("newConditionInit") + @RequestMapping(value = "newConditionInit", method = RequestMethod.POST) private String newConditionInit(@ModelAttribute NotebookConditionForm notebookConditionForm, HttpServletRequest request) { String sessionMapID = WebUtil.readStrParam(request, NotebookConstants.ATTR_SESSION_MAP_ID); @@ -93,7 +94,7 @@ * @param response * @return */ - @RequestMapping("/editCondition") + @RequestMapping(value = "/editCondition", method = RequestMethod.POST) private String editCondition(NotebookConditionForm notebookConditionForm, HttpServletRequest request) { String sessionMapID = notebookConditionForm.getSessionMapID(); @@ -125,7 +126,7 @@ * @return * @throws ServletException */ - @RequestMapping("/saveOrUpdateCondition") + @RequestMapping(value = "/saveOrUpdateCondition", method = RequestMethod.POST) private String saveOrUpdateCondition( @ModelAttribute("notebookConditionForm") NotebookConditionForm notebookConditionForm, HttpServletRequest request) { @@ -165,7 +166,7 @@ * @param response * @return */ - @RequestMapping("/removeCondition") + @RequestMapping(value = "/removeCondition", method = RequestMethod.POST) private String removeCondition(HttpServletRequest request) { // get back sessionMAP @@ -202,7 +203,7 @@ * @param response * @return */ - @RequestMapping("/upCondition") + @RequestMapping(value = "/upCondition", method = RequestMethod.POST) private String upCondition(HttpServletRequest request) { return switchItem(request, true); } @@ -216,12 +217,12 @@ * @param response * @return */ - @RequestMapping("/downCondition") + @RequestMapping(value = "/downCondition", method = RequestMethod.POST) private String downCondition(HttpServletRequest request) { return switchItem(request, false); } - @RequestMapping("/switchItem") + @RequestMapping(value = "/switchItem", method = RequestMethod.POST) private String switchItem(HttpServletRequest request, boolean up) { // get back sessionMAP String sessionMapID = WebUtil.readStrParam(request, NotebookConstants.ATTR_SESSION_MAP_ID); @@ -382,8 +383,4 @@ } } -// private ActionMessages validate(AuthoringForm taskListForm, ActionMapping mapping, HttpServletRequest request) { -// return new ActionMessages(); -// } - } \ No newline at end of file Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/ClearSessionController.java =================================================================== diff -u -r749b841adf6115016059d15ddfa58aee5b11e26d -r74280645f86d72ceabada5d340a174c4b10d9d53 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/ClearSessionController.java (.../ClearSessionController.java) (revision 749b841adf6115016059d15ddfa58aee5b11e26d) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/ClearSessionController.java (.../ClearSessionController.java) (revision 74280645f86d72ceabada5d340a174c4b10d9d53) @@ -34,6 +34,7 @@ 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; /** @@ -49,7 +50,7 @@ @Autowired private WebApplicationContext applicationContext; - @RequestMapping("/clearsession") + @RequestMapping(value = "/clearsession", method = RequestMethod.POST) public void execute(HttpServletRequest request, HttpServletResponse response) throws IOException { super.execute(request, response, applicationContext); } Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java =================================================================== diff -u -re1f494e2cf97728e4ae12e61620608cdc6c19ae3 -r74280645f86d72ceabada5d340a174c4b10d9d53 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java (.../LearningController.java) (revision e1f494e2cf97728e4ae12e61620608cdc6c19ae3) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java (.../LearningController.java) (revision 74280645f86d72ceabada5d340a174c4b10d9d53) @@ -58,6 +58,7 @@ 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; /** @@ -84,7 +85,7 @@ @Autowired private WebApplicationContext applicationContext; - @RequestMapping("") + @RequestMapping(value = "", method = RequestMethod.POST) public String unspecified(@ModelAttribute("messageForm") LearningForm messageForm, HttpServletRequest request) throws Exception { @@ -198,7 +199,7 @@ return notebookUser; } - @RequestMapping("/finishActivity") + @RequestMapping(value = "/finishActivity", method = RequestMethod.POST) public String finishActivity(@ModelAttribute("messageForm") LearningForm messageForm, HttpServletRequest request, HttpServletResponse response) { Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java =================================================================== diff -u -rc50f8841ee2ef0ada48c7678eefb14b8f597ff2c -r74280645f86d72ceabada5d340a174c4b10d9d53 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c50f8841ee2ef0ada48c7678eefb14b8f597ff2c) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 74280645f86d72ceabada5d340a174c4b10d9d53) @@ -48,6 +48,7 @@ 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.util.HtmlUtils; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -67,7 +68,7 @@ @Qualifier("notebookMessageService") private MessageService messageService; - @RequestMapping("/") + @RequestMapping(value = "", method = RequestMethod.POST) public String unspecified(HttpServletRequest request) { Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); @@ -102,7 +103,7 @@ return "pages/monitoring/monitoring"; } - @RequestMapping("/getUsers") + @RequestMapping(value = "/getUsers", method = RequestMethod.POST) public String getUsers(HttpServletRequest request, HttpServletResponse response) throws IOException { Long toolSessionId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); @@ -191,7 +192,7 @@ * @throws Exception */ - @RequestMapping("/saveTeacherComment") + @RequestMapping(value = "/saveTeacherComment", method = RequestMethod.POST) public String saveTeacherComment(HttpServletRequest request) throws Exception { String teachersComment = WebUtil.readStrParam(request, "value", true); @@ -225,7 +226,7 @@ * @throws IOException */ - @RequestMapping("/setSubmissionDeadline") + @RequestMapping(value = "/setSubmissionDeadline", method = RequestMethod.POST) public String setSubmissionDeadline(HttpServletRequest request, HttpServletResponse response) throws IOException { Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); @@ -253,7 +254,7 @@ /** Get the statistics for monitoring */ - @RequestMapping("/getStatistics") + @RequestMapping(value = "/getStatistics") public String getStatistics(HttpServletRequest request) { Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java =================================================================== diff -u -rb55462c1bed962dba08744bf8ceac6594c3462f2 -r74280645f86d72ceabada5d340a174c4b10d9d53 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision b55462c1bed962dba08744bf8ceac6594c3462f2) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision 74280645f86d72ceabada5d340a174c4b10d9d53) @@ -38,6 +38,7 @@ import org.springframework.stereotype.Controller; import org.springframework.validation.Errors; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; /** * @author @@ -58,15 +59,15 @@ @Qualifier("notebookService") private INotebookService notebookService; - @RequestMapping("/") + @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); } - @RequestMapping("/initPedagogicalPlannerForm") + @RequestMapping(value = "/initPedagogicalPlannerForm", method = RequestMethod.POST) public String initPedagogicalPlannerForm(NotebookPedagogicalPlannerForm pedagogicalPlannerForm, HttpServletRequest request) { NotebookPedagogicalPlannerForm plannerForm = pedagogicalPlannerForm; @@ -78,7 +79,7 @@ return "pages/authoring/pedagogicalPlannerForm"; } - @RequestMapping("/saveOrUpdatePedagogicalPlannerForm") + @RequestMapping(value = "/saveOrUpdatePedagogicalPlannerForm", method = RequestMethod.POST) public String saveOrUpdatePedagogicalPlannerForm(NotebookPedagogicalPlannerForm pedagogicalPlannerForm, Errors errors, HttpServletRequest request) throws IOException { pedagogicalPlannerForm.validate(); Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -r74280645f86d72ceabada5d340a174c4b10d9d53 --- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 60d9a173d5590295376322fc3e857ae2dca37717) +++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 74280645f86d72ceabada5d340a174c4b10d9d53) @@ -212,192 +212,6 @@ - - STRUTS-textarea - org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag - empty - - accesskey - false - true - - - alt - false - true - - - altKey - false - true - - - bundle - false - true - - - cols - false - true - - - disabled - false - true - - - errorKey - false - true - - - errorStyle - false - true - - - errorStyleClass - false - true - - - errorStyleId - false - true - - - index - false - true - - - indexed - false - true - - - name - false - true - - - onblur - false - true - - - onchange - false - true - - - onclick - false - true - - - ondblclick - false - true - - - onfocus - false - true - - - onkeydown - false - true - - - onkeypress - false - true - - - onkeyup - false - true - - - onmousedown - false - true - - - onmousemove - false - true - - - onmouseout - false - true - - - onmouseover - false - true - - - onmouseup - false - true - - - property - true - true - - - readonly - false - true - - - rows - false - true - - - style - false - true - - - styleClass - false - true - - - styleId - false - true - - - tabindex - false - true - - - title - false - true - - - titleKey - false - true - - - value - false - true - - - Small portrait of a user User Portrait Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -r74280645f86d72ceabada5d340a174c4b10d9d53 --- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 60d9a173d5590295376322fc3e857ae2dca37717) +++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 74280645f86d72ceabada5d340a174c4b10d9d53) @@ -212,191 +212,6 @@ - - STRUTS-textarea - org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag - empty - - accesskey - false - true - - - alt - false - true - - - altKey - false - true - - - bundle - false - true - - - cols - false - true - - - disabled - false - true - - - errorKey - false - true - - - errorStyle - false - true - - - errorStyleClass - false - true - - - errorStyleId - false - true - - - index - false - true - - - indexed - false - true - - - name - false - true - - - onblur - false - true - - - onchange - false - true - - - onclick - false - true - - - ondblclick - false - true - - - onfocus - false - true - - - onkeydown - false - true - - - onkeypress - false - true - - - onkeyup - false - true - - - onmousedown - false - true - - - onmousemove - false - true - - - onmouseout - false - true - - - onmouseover - false - true - - - onmouseup - false - true - - - property - true - true - - - readonly - false - true - - - rows - false - true - - - style - false - true - - - styleClass - false - true - - - styleId - false - true - - - tabindex - false - true - - - title - false - true - - - titleKey - false - true - - - value - false - true - - Small portrait of a user