Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r388b3abd9fd8b750b4fbb12028fa856a0a11249e
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
@@ -231,7 +231,7 @@
 
 	// security check will be done there
 	String url = Configuration.get(ConfigurationKeys.SERVER_URL)
-		+ "monitoring/monitoring.do?method=monitorLesson&lessonID=" + lessonId;
+		+ "monitoring/monitoring/monitorLesson.do?&lessonID=" + lessonId;
 	res.sendRedirect(url);
 	return null;
     }
Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r388b3abd9fd8b750b4fbb12028fa856a0a11249e
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
@@ -63,7 +63,7 @@
 	<i class="fa fa-refresh fa-spin fa-3x fa-fw"></i>
 </div>
 
-<form id="lessonForm" action="<lams:LAMSURL/>monitoring/monitoring.do" method="POST">
+<form id="lessonForm" action="<lams:LAMSURL/>monitoring/monitoring/addLesson.do" method="POST">
 
 <lams:Page type="navbar">
 		<lams:Tabs>
@@ -159,7 +159,6 @@
 				</lams:TabBody>
 				<lams:TabBody id="3" titleKey="label.tab.advanced">
 					<!-- Advanced Panel -->
-					<input name="method" value="addLesson" type="hidden" />
 					<input name="organisationID" value="${param.organisationID}" type="hidden" />
 					<input id="ldIdField" name="learningDesignID" type="hidden" />
 					<input id="lessonNameField" name="lessonName" type="hidden" />
Index: lams_central/web/includes/javascript/addLesson.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r388b3abd9fd8b750b4fbb12028fa856a0a11249e
--- lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
@@ -406,9 +406,8 @@
 	var previewButton = $('#previewButton').button('loading');
 	// initialize, create and enter the preview lesson
 	$.ajax({
-		url : LAMS_URL + 'monitoring/monitoring.do',
+		url : LAMS_URL + 'monitoring/monitoring/initializeLesson.do',
 		data : {
-			'method' : 'initializeLesson',
 			'learningDesignID' : ldNode.data.learningDesignId,
 			'copyType' : 3,
 			'lessonName' : LABEL_PREVIEW_LESSON_DEFAULT_TITLE
@@ -423,10 +422,9 @@
 			}
 			
 			$.ajax({
-				url : LAMS_URL + 'monitoring/monitoring.do',
+				url : LAMS_URL + 'monitoring/monitoring/startPreviewLesson.do',
 				data : {
-					'method' : 'startPreviewLesson',
-					'lessonID' : lessonID
+s					'lessonID' : lessonID
 				},
 				cache : false,
 				dataType : 'text',
Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r388b3abd9fd8b750b4fbb12028fa856a0a11249e
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
@@ -639,8 +639,8 @@
 		if (confirm(LABELS.REMOVE_LESSON_CONFIRM2)) {
 			$.ajax({
 				async : false,
-				url : LAMS_URL + "monitoring/monitoring.do",
-				data : "method=removeLesson&lessonID=" + lessonID,
+				url : LAMS_URL + "monitoring/monitoring/removeLesson.do",
+				data : "lessonID=" + lessonID,
 				type : "POST",
 				success : function(json) {
 					if (json.removeLesson == true) {
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r388b3abd9fd8b750b4fbb12028fa856a0a11249e
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
@@ -126,15 +126,15 @@
  */
 function openLearnerShortenedUrl( lessonId ) {
 	if (isMac) {
-		learnWin = window.open('../home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width 
+		learnWin = window.open('../home/learner.do&lessonID='+lessonId,'lWindow','width=' + learner_width 
 				   + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes'
 				   + getCenterParams(learner_width, learner_height));
 	} else {
 		if (learnWin && !learnWin.closed ) {
-			learnWin.location = '../home.do?method=learner&lessonID='+lessonId;		
+			learnWin.location = '../home/learner.do&lessonID='+lessonId;		
 			learnWin.focus();
 		} else {
-			learnWin = window.open('../home.do?method=learner&lessonID='+lessonId,'lWindow','width='
+			learnWin = window.open('../home/learner.do&lessonID='+lessonId,'lWindow','width='
 					   + learner_width + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes'
 					   + getCenterParams(learner_width, learner_height));
 		}
Index: lams_central/web/lti/addLesson.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r388b3abd9fd8b750b4fbb12028fa856a0a11249e
--- lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
@@ -128,9 +128,8 @@
 		
 		// initialize, create and enter the preview lesson
 		$.ajax({
-			url : LAMS_URL + 'monitoring/monitoring.do',
+			url : LAMS_URL + 'monitoring/monitoring/initializeLesson.do',
 			data : {
-				'method' : 'initializeLesson',
 				'learningDesignID' : ldId,
 				'copyType' : 3,
 				'lessonName' : "<fmt:message key='authoring.fla.preview.lesson.default.title' />"
@@ -144,7 +143,7 @@
 				}
 				
 				$.ajax({
-					url : LAMS_URL + 'monitoring/monitoring.do',
+					url : LAMS_URL + 'monitoring/monitoring/startPreviewLesson.do',
 					data : {
 						'method' : 'startPreviewLesson',
 						'lessonID' : lessonID
Index: lams_common/db/sql/patch20180827.sql
===================================================================
diff -u
--- lams_common/db/sql/patch20180827.sql	(revision 0)
+++ lams_common/db/sql/patch20180827.sql	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
@@ -0,0 +1,66 @@
+-- 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
+monitor_url = 'monitoring/grouping/startGrouping.do',
+contribute_url = 'monitoring/grouping/startGrouping.do',
+WHERE system_tool_id = 1;
+
+UPDATE lams_system_tool SET
+monitor_url = 'monitoring/gate/viewGate.do',
+contribute_url = 'monitoring/gate/viewGate.do'
+WHERE system_tool_id = 2;
+
+UPDATE lams_system_tool SET
+monitor_url = 'monitoring/gate/viewGate.do',
+contribute_url = 'monitoring/gate/viewGate.do'
+WHERE system_tool_id = 3;
+
+UPDATE lams_system_tool SET
+monitor_url = 'monitoring/gate/viewGate.do',
+contribute_url = 'monitoring/gate/viewGate.do'
+WHERE system_tool_id = 4;
+
+UPDATE lams_system_tool SET
+monitor_url = 'monitoring/gate/viewGate.do',
+contribute_url = 'monitoring/gate/viewGate.do'
+WHERE system_tool_id = '5';
+
+UPDATE lams_system_tool SET
+learner_progress_url = 'monitoring/complexProgress.do',
+monitor_url = 'monitoring/chosenBranching.do?method=assignBranch',
+contribute_url = 'monitoring/grouping/startGrouping.do'
+WHERE system_tool_id = '6';
+
+UPDATE lams_system_tool SET
+learner_progress_url = 'monitoring/complexProgress.do',
+monitor_url = 'monitoring/groupedBranching.do?method=viewBranching',
+contribute_url = 'monitoring/groupedBranching.do?method=assignBranch'
+WHERE system_tool_id = '7';
+
+UPDATE lams_system_tool SET
+learner_progress_url = 'monitoring/complexProgress.do',
+monitor_url = 'monitoring/toolBranching.do?method=viewBranching',
+contribute_url = 'monitoring/toolBranching.do?method=viewBranching'
+WHERE system_tool_id = '8';
+
+UPDATE lams_system_tool SET
+learner_progress_url = 'monitoring/complexProgress.do',
+monitor_url = 'monitoring/sequence/viewSequence.do',
+contribute_url = 'monitoring/sequence/viewSequence.do'
+WHERE system_tool_id = '9';
+
+UPDATE lams_system_tool SET
+monitor_url = 'monitoring/gate/viewGate.do',
+contribute_url = 'monitoring/gate/viewGate.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;
Fisheye: Tag 388b3abd9fd8b750b4fbb12028fa856a0a11249e refers to a dead (removed) revision in file `lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingController.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 388b3abd9fd8b750b4fbb12028fa856a0a11249e refers to a dead (removed) revision in file `lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXController.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -r388b3abd9fd8b750b4fbb12028fa856a0a11249e
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java	(.../GroupingUploadAJAXController.java)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java	(.../GroupingUploadAJAXController.java)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
@@ -522,7 +522,7 @@
 	return skipped;
     }
 
-    final Comparator<OrganisationGroup> ORG_GROUP_COMPARATOR = new Comparator<>() {
+    final Comparator<OrganisationGroup> ORG_GROUP_COMPARATOR = new Comparator<OrganisationGroup>() {
 	@Override
 	public int compare(OrganisationGroup o1, OrganisationGroup o2) {
 	    String grp1Name = o1 != null ? o1.getName() : "";
Fisheye: Tag 388b3abd9fd8b750b4fbb12028fa856a0a11249e refers to a dead (removed) revision in file `lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ToolOutputBranchingAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/web/emailnotifications/scheduledEmailList.jsp
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -r388b3abd9fd8b750b4fbb12028fa856a0a11249e
--- lams_monitoring/web/emailnotifications/scheduledEmailList.jsp	(.../scheduledEmailList.jsp)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/web/emailnotifications/scheduledEmailList.jsp	(.../scheduledEmailList.jsp)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
@@ -24,7 +24,7 @@
 		if (confirm(msg+'\n\n'+deleteConfirmationMessage2)) {
  			$.ajax({
 				async : false,
-				url : '<c:url value="/emailNotifications.do"/>',
+				url : '<c:url value="/emailNotifications/"/>',
  				data : deleteUrlParams+'&triggerName=' + triggerName,
  				type : "POST",
 				success : function(json) {
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -r388b3abd9fd8b750b4fbb12028fa856a0a11249e
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
@@ -296,15 +296,14 @@
 
 function applyStateChange(state, method, newLessonEndDate) {
 	var params = {
-			'method'    : method,
 			'lessonID'  : lessonId,
 		};
 	if ( newLessonEndDate ) {
 		params.lessonEndDate = newLessonEndDate;
 	}
 	
 	$.ajax({
-		url : LAMS_URL + 'monitoring/monitoring.do',
+		url : LAMS_URL + 'monitoring/monitoring/' + method + ".do",
 		cache : false,
 		data : params,
 		success : function() {
@@ -327,10 +326,9 @@
 function updateLessonTab(){
 	$.ajax({
 		dataType : 'json',
-		url : LAMS_URL + 'monitoring/monitoring.do',
+		url : LAMS_URL + 'monitoring/monitoring/getLessonDetails.do',
 		cache : false,
 		data : {
-			'method'    : 'getLessonDetails',
 			'lessonID'  : lessonId
 		},
 		
Index: lams_monitoring/web/taglibs.jsp
===================================================================
diff -u
--- lams_monitoring/web/taglibs.jsp	(revision 0)
+++ lams_monitoring/web/taglibs.jsp	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
@@ -0,0 +1,11 @@
+<%@ page contentType="text/html; charset=utf-8" language="java" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-xml" prefix="x" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:set var="ALPHABET" value="${fn:split('a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z', ',')}" scope="request"/>
+<c:set var="ALPHABET_CAPITAL_LETTERS" value="${fn:split('A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z', ',')}" scope="request"/>
+
Index: lams_monitoring/web/tblmonitor/sequence.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r388b3abd9fd8b750b4fbb12028fa856a0a11249e
--- lams_monitoring/web/tblmonitor/sequence.jsp	(.../sequence.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/tblmonitor/sequence.jsp	(.../sequence.jsp)	(revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e)
@@ -168,10 +168,10 @@
 
 		//Disable sequence button handler 
 		$('#disable-sequence-button').click(function () {
-	        var method = (lessonStateId == 3) ? "suspendLesson" : "unsuspendLesson";
+	        var method = (lessonStateId == 3) ? "suspendLesson.do" : "unsuspendLesson.do";
 			$.ajax({
 				dataType : 'xml',
-				url : LAMS_URL + 'monitoring/monitoring.do',
+				url : LAMS_URL + 'monitoring/monitoring/',
 				cache : false,
 				data : {
 					'method'    : method,
Fisheye: Tag 388b3abd9fd8b750b4fbb12028fa856a0a11249e refers to a dead (removed) revision in file `lams_monitoring/web/template/taglibs.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?