Index: lams_build/lib/lams/lams-gradebook.jar
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r580d89078524d7f06eccd71feefc7e6f98717538
Binary files differ
Index: lams_build/lib/lams/lams-learning.jar
===================================================================
diff -u -r4e2c39e0ea14d5a8aa406327a16425e81b1e6702 -r580d89078524d7f06eccd71feefc7e6f98717538
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r580d89078524d7f06eccd71feefc7e6f98717538
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql	(.../patch20180821.sql)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql	(.../patch20180821.sql)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
@@ -1 +1,59 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4440 Update system tool access URLs after migration to Spring MVC
+UPDATE lams_system_tool SET
+learner_url = 'learning/grouping/performGrouping.do',
+learner_preview_url = 'learning/grouping/performGrouping.do',
+learner_progress_url = 'learning/grouping/viewGrouping.do?mode=teacher'
+WHERE system_tool_id = 1;
+
+UPDATE lams_system_tool SET
+learner_url = 'learning/gate/knockGate.do',
+learner_preview_url = 'learning/gate/knockGate.do'
+WHERE system_tool_id = 2;
+
+UPDATE lams_system_tool SET
+learner_url = 'learning/gate/knockGate.do',
+learner_preview_url = 'learning/gate/knockGate.do'
+WHERE system_tool_id = 3;
+
+UPDATE lams_system_tool SET
+learner_url = 'learning/gate/knockGate.do',
+learner_preview_url = 'learning/gate/knockGate.do'
+WHERE system_tool_id = 4;
+
+UPDATE lams_system_tool SET
+learner_url = 'learning/gate/knockGate.do',
+learner_preview_url = 'learning/gate/knockGate.do'
+WHERE system_tool_id = '5';
+
+UPDATE lams_system_tool SET
+learner_url = 'learning/branching/performBranching.do',
+learner_preview_url = 'learning/branching/performBranching.do'
+WHERE system_tool_id = '6';
+
+UPDATE lams_system_tool SET
+learner_url = 'learning/branching/performBranching.do',
+learner_preview_url = 'learning/branching/performBranching.do'
+WHERE system_tool_id = '7';
+
+UPDATE lams_system_tool SET
+learner_url = 'learning/branching/performBranching.do',
+learner_preview_url = 'learning/branching/performBranching.do'
+WHERE system_tool_id = '8';
+
+UPDATE lams_system_tool SET
+learner_url = 'learning/gate/knockGate.do',
+learner_preview_url = 'learning/gate/knockGate.do'
+WHERE system_tool_id = '10';
+
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r580d89078524d7f06eccd71feefc7e6f98717538
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java	(.../GradebookMonitoringController.java)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java	(.../GradebookMonitoringController.java)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
@@ -291,16 +291,15 @@
      */
     @RequestMapping("/toggleReleaseMarks")
     @ResponseBody
-    public void toggleReleaseMarks(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    public String toggleReleaseMarks(HttpServletRequest request, HttpServletResponse response) throws Exception {
 	Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	if (!securityService.isLessonMonitor(lessonID, getUser().getUserID(), "toggle release marks", false)) {
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the lesson");
 	}
 
 	gradebookService.toggleMarksReleased(lessonID);
 	response.setContentType("text/plain; charset=utf-8");
-	PrintWriter writer = response.getWriter();
-	writer.print("succes");
+	return "success";
 	
     }
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r580d89078524d7f06eccd71feefc7e6f98717538
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(.../GroupingController.java)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(.../GroupingController.java)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
@@ -51,6 +51,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.RequestParam;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -143,7 +144,7 @@
 	request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
 	if (groupingDone) {
 	    request.setAttribute(GroupingController.FINISHED_BUTTON, Boolean.TRUE);
-	    return "redirect: grouping/viewGroup.do";
+	    return viewGrouping(request, learnerProgress) ;
 	}
 	// forward to group choosing page
 	if (((GroupingActivity) activity).getCreateGrouping().isLearnerChoiceGrouping()) {
@@ -173,13 +174,13 @@
      * @throws IOException
      * @throws ServletException
      */
-    @RequestMapping("/viewGroup")
-    public String viewGrouping(HttpServletRequest request) throws IOException, ServletException {
-	return viewGrouping(request, null);
-    }
+//    @RequestMapping("/viewGroup")
+//    public String viewGrouping(HttpServletRequest request) throws IOException, ServletException {
+//	return viewGrouping(request, null);
+//    }
 
     @RequestMapping("/viewGroup")
-    public String viewGrouping(HttpServletRequest request, LearnerProgress learnerProgress)
+    public String viewGrouping(HttpServletRequest request,@RequestParam (required = false)LearnerProgress learnerProgress)
 	    throws IOException, ServletException {
 	prepareGroupData(request);
 	request.setAttribute(GroupingController.LOCAL_FILES, Boolean.FALSE);
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r580d89078524d7f06eccd71feefc7e6f98717538
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(.../NotebookController.java)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(.../NotebookController.java)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
@@ -214,7 +214,7 @@
     /**
      *
      */
-    @RequestMapping("/add")
+    @RequestMapping("/processNewEntry")
     public String processNewEntry(@ModelAttribute NotebookForm notebookForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
Index: lams_learning/web/grouping/choose.jsp
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r580d89078524d7f06eccd71feefc7e6f98717538
--- lams_learning/web/grouping/choose.jsp	(.../choose.jsp)	(revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4)
+++ lams_learning/web/grouping/choose.jsp	(.../choose.jsp)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
@@ -97,7 +97,7 @@
 								</c:when>
 								<c:otherwise>
 									<form:form
-										action="/grouping/learnerChooseGroup.do?userId=${user.userID}&activityID=${activityID}&groupId=${group.groupID}"
+										action="grouping/learnerChooseGroup.do?userId=${user.userID}&activityID=${activityID}&groupId=${group.groupID}"
 										modelAttribute="form${user.userID}${activityID}${group.groupID}" id="form${user.userID}${activityID}${group.groupID}" target="_self">
 									</form:form>							
 									<button type="button" class="btn btn-sm btn-primary" 
Index: lams_learning/web/grouping/show.jsp
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r580d89078524d7f06eccd71feefc7e6f98717538
--- lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4)
+++ lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
@@ -52,7 +52,7 @@
 	<lams:Page type="learner" title="${title}">
 	
 		<form:form
-			action="/grouping/completeActivity.do?userId=${user.userID}&lessonId=${lessonID}&activityID=${activityID}"
+			action="/completeActivity.do?userId=${user.userID}&lessonId=${lessonID}&activityID=${activityID}"
 			target="_self" modelAttribute="messageForm" id="messageForm">
 	
 			<c:set var="userId" value="${user.userID}" />
@@ -66,7 +66,7 @@
 	
 					<div class="table-responsive">
 						<table class="table table-condensed table-hover" cellspacing="0">
-							<logic:iterate id="group" name="groups">
+							<c:forEach var="group" items="${groups}">
 								<tr>
 									<td width="15%"><strong><c:out value="${group.groupName}" /></strong></td>
 									<td><c:forEach items="${group.userList}" var="user">
@@ -75,7 +75,7 @@
 											</div>
 										</c:forEach></td>
 								</tr>
-							</logic:iterate>
+							</c:forEach>
 						</table>
 					</div>
 	
Index: lams_learning/web/grouping/wait.jsp
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r580d89078524d7f06eccd71feefc7e6f98717538
--- lams_learning/web/grouping/wait.jsp	(.../wait.jsp)	(revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4)
+++ lams_learning/web/grouping/wait.jsp	(.../wait.jsp)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
@@ -28,7 +28,7 @@
 		<title><fmt:message key="label.view.groups.title"/></title>
 		<lams:css/>
 		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-		<META HTTP-EQUIV="Refresh" CONTENT="60;URL=<lams:WebAppURL/>/grouping/performGrouping.do?activityID=${GroupingForm.map.activityID}">
+		<META HTTP-EQUIV="Refresh" CONTENT="60;URL=<lams:WebAppURL/>grouping/performGrouping.do?activityID=${GroupingForm.map.activityID}">
 	  </lams:head>
 
 	<body class="stripes">
Index: lams_learning/web/layout/groupWaitLayout.jsp
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r580d89078524d7f06eccd71feefc7e6f98717538
--- lams_learning/web/layout/groupWaitLayout.jsp	(.../groupWaitLayout.jsp)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/web/layout/groupWaitLayout.jsp	(.../groupWaitLayout.jsp)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
@@ -28,7 +28,7 @@
 		<title><fmt:message key="label.view.groups.title"/></title>
 		<lams:css/>
 		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-		<META HTTP-EQUIV="Refresh" CONTENT="60;URL=<lams:WebAppURL/>/grouping/performGrouping.do?activityID=${GroupingForm.map.activityID}">
+		<META HTTP-EQUIV="Refresh" CONTENT="60;URL=<lams:WebAppURL/>grouping/performGrouping.do?activityID=${GroupingForm.map.activityID}">
 	  </lams:head>
 
 	<body class="stripes">
Index: lams_learning/web/notebook/addnew.jsp
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r580d89078524d7f06eccd71feefc7e6f98717538
--- lams_learning/web/notebook/addnew.jsp	(.../addnew.jsp)	(revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4)
+++ lams_learning/web/notebook/addnew.jsp	(.../addnew.jsp)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
@@ -20,7 +20,7 @@
 --%>
 
 <!DOCTYPE html>
-
+<%@ page import="org.lamsfoundation.lams.notebook.service.CoreNotebookConstants"%>
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
Index: lams_learning/web/notebook/viewall.jsp
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r580d89078524d7f06eccd71feefc7e6f98717538
--- lams_learning/web/notebook/viewall.jsp	(.../viewall.jsp)	(revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4)
+++ lams_learning/web/notebook/viewall.jsp	(.../viewall.jsp)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
@@ -53,7 +53,7 @@
 	
 	<lams:Page type="learner" title="${title}" hideProgressBar="true">
 		<c:set var="addnote">
-			<c:url value="/notebook/add.do?lessonID=" />
+			<c:url value="/notebook/addnew.jsp?lessonID=" />
 			<c:out value="${lessonID}" />
 		</c:set>
 		<div class="pull-right">
@@ -78,7 +78,7 @@
 					</c:set>
 	
 					<c:set var="addnote">
-						<c:url value="/notebook/add.do?currentLessonID=${lessonID}&lessonID=" />
+						<c:url value="/notebook/addnew.jsp?currentLessonID=${lessonID}&lessonID=" />
 						<c:out value="${entry.externalID}" />
 					</c:set>