Fisheye: Tag d55428a1d82ca2bd213d694d3a5cb08a08890609 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20180719.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20180720.sql
===================================================================
diff -u
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20180720.sql	(revision 0)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20180720.sql	(revision d55428a1d82ca2bd213d694d3a5cb08a08890609)
@@ -0,0 +1,23 @@
+-- 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 Change tool access URLs after migration to Spring MVC
+UPDATE lams_tool SET 
+	author_url = 'tool/lasbmt11/authoring/authoring.do',
+	learner_url = 'tool/lasbmt11/learning/learner.do',
+	learner_preview_url = 'tool/lasbmt11/learning/author.do',
+	learner_progress_url = 'tool/lasbmt11/learning/teacher.do',
+	monitor_url = 'tool/lasbmt11/monitoring/monitoring.do',
+	pedagogical_planner_url = 'tool/lasbmt11/pedagogicalPlanner/initPedagogicalPlannerForm.do'
+WHERE tool_signature = 'lasbmt11';
+
+UPDATE lams_tool SET tool_version='20180720' WHERE tool_signature='lasbmt11';
+
+----------------------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;
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -rd55428a1d82ca2bd213d694d3a5cb08a08890609
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision d55428a1d82ca2bd213d694d3a5cb08a08890609)
@@ -610,7 +610,7 @@
     public void uploadFileToSession(Long sessionID, MultipartFile file, String fileDescription, Integer userID)
 	    throws SubmitFilesException {
 
-	if ((file == null) || StringUtils.isEmpty(file.getName())) {
+	if ((file == null) || StringUtils.isEmpty(file.getOriginalFilename())) {
 	    throw new SubmitFilesException("Could not find upload file: " + file);
 	}
 
@@ -623,7 +623,7 @@
 
 	SubmissionDetails details = new SubmissionDetails();
 	details.setFileDescription(fileDescription);
-	details.setFilePath(file.getName());
+	details.setFilePath(file.getOriginalFilename());
 	details.setDateOfSubmission(new Date());
 
 	SubmitUser learner = submitUserDAO.getLearner(sessionID, userID);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java
===================================================================
diff -u -ra99e23fb3a32273bb906230e7314380ccd8e03f8 -rd55428a1d82ca2bd213d694d3a5cb08a08890609
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision a99e23fb3a32273bb906230e7314380ccd8e03f8)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision d55428a1d82ca2bd213d694d3a5cb08a08890609)
@@ -84,7 +84,7 @@
  * @author Steve.Ni
  */
 @Controller
-@RequestMapping("/learner")
+@RequestMapping("/learning")
 public class LearnerController implements SbmtConstants {
 
     private static final boolean MODE_OPTIONAL = false;
@@ -106,7 +106,7 @@
      * The initial page of learner in Submission tool. This page will list all uploaded files and learn
      */
     @RequestMapping("/learner")
-    public String unspecified(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request) {
+    public String learner(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request) {
 	// initial session Map
 	SessionMap sessionMap = new SessionMap();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
@@ -266,6 +266,20 @@
 	return "learner/sbmtlearner";
     }
 
+    @RequestMapping("/teacher")
+    public String teacher(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request,
+	    HttpServletResponse response) {
+	request.setAttribute("mode", "teacher");
+	return learner(learnerForm, request);
+    }
+
+    @RequestMapping("/author")
+    public String author(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request,
+	    HttpServletResponse response) {
+	request.setAttribute("mode", "author");
+	return learner(learnerForm, request);
+    }
+
     /**
      * Loads the main learner page with the details currently in the session map
      */
@@ -356,7 +370,7 @@
      * field by special toolSessionID and userID.
      */
     @RequestMapping("/finish")
-    public void finish(HttpServletRequest request, HttpServletResponse response) {
+    public String finish(HttpServletRequest request, HttpServletResponse response) {
 
 	String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
@@ -379,15 +393,14 @@
 	    String nextActivityUrl;
 	    try {
 		nextActivityUrl = sessionMgrService.leaveToolSession(sessionID, new Long(userID.intValue()));
-		response.sendRedirect(nextActivityUrl);
+		return "redirect:" + nextActivityUrl;
 	    } catch (DataMissingException e) {
 		throw new SubmitFilesException(e);
 	    } catch (ToolException e) {
 		throw new SubmitFilesException(e);
-	    } catch (IOException e) {
-		throw new SubmitFilesException(e);
 	    }
 	}
+	return null;
     }
 
     // **********************************************************************************************
@@ -527,7 +540,7 @@
      * Display empty reflection form.
      */
     @RequestMapping("/newReflection")
-    public String newReflection(@ModelAttribute ReflectionForm refForm, HttpServletRequest request,
+    public String newReflection(@ModelAttribute("refForm") ReflectionForm refForm, HttpServletRequest request,
 	    HttpServletResponse response) {
 
 //		ISubmitFilesService submitFilesService = getService();
@@ -565,7 +578,8 @@
      * Submit reflection form input database.
      */
     @RequestMapping("/submitReflection")
-    public String submitReflection(@ModelAttribute ReflectionForm refForm, HttpServletRequest request) {
+    public String submitReflection(@ModelAttribute("refForm") ReflectionForm refForm, HttpServletRequest request,
+	    HttpServletResponse response) {
 	Integer userId = refForm.getUserID();
 
 	String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
@@ -589,7 +603,7 @@
 	    submitFilesService.updateEntry(entry);
 	}
 
-	return "learner/finish";
+	return finish(request, response);
     }
 
     public static void validateBeforeFinish(HttpServletRequest request, ISubmitFilesService submitFilesService) {
Index: lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp
===================================================================
diff -u -r9bd48180632126e711896a486782d581e2e78750 -rd55428a1d82ca2bd213d694d3a5cb08a08890609
--- lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp	(.../redirectAfterSubmit.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
+++ lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp	(.../redirectAfterSubmit.jsp)	(revision d55428a1d82ca2bd213d694d3a5cb08a08890609)
@@ -8,7 +8,7 @@
 <%@ include file="/common/header.jsp"%>
 <script language="JavaScript" type="text/JavaScript">
 	$(document).ready(function(){
-		window.location.href = '<lams:WebAppURL />learner/refresh.do?sessionMapID=${sessionMapID}';
+		window.location.href = '<lams:WebAppURL />learning/refresh.do?sessionMapID=${sessionMapID}';
 	});
 </script>
 </lams:head>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -ra99e23fb3a32273bb906230e7314380ccd8e03f8 -rd55428a1d82ca2bd213d694d3a5cb08a08890609
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision a99e23fb3a32273bb906230e7314380ccd8e03f8)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision d55428a1d82ca2bd213d694d3a5cb08a08890609)
@@ -48,11 +48,11 @@
 			}
 		}
 		function finish() {
-			var finishUrl = "<lams:WebAppURL />learner/finish.do?sessionMapID=${sessionMapID}";
+			var finishUrl = "<lams:WebAppURL />learning/finish.do?sessionMapID=${sessionMapID}";
 			return submitCount(finishUrl);
 		}
 		function notebook() {
-			var continueUrl = "<lams:WebAppURL />learner/newReflection.do?sessionMapID=${sessionMapID}";
+			var continueUrl = "<lams:WebAppURL />learning/newReflection.do?sessionMapID=${sessionMapID}";
 			return submitCount(continueUrl);
 		}
 		function validate() {
@@ -107,7 +107,7 @@
 				 $.ajax({
 			            data: 'detailId=' + detailId,
 			            success: function () {
-			            	document.location.href = "<lams:WebAppURL />learner/"+${sessionMap.mode}+".do?toolSessionID="+${sessionMap.toolSessionID};
+			            	document.location.href = "<lams:WebAppURL />learning/"+${sessionMap.mode}+".do?toolSessionID="+${sessionMap.toolSessionID};
 			            },
 			            error: function(error){
 			                alert("readyState: "+xhr.readyState+"\nstatus: "+xhr.status);
Index: lams_tool_sbmt/web/monitoring/parts/activity.jsp
===================================================================
diff -u -r9bd48180632126e711896a486782d581e2e78750 -rd55428a1d82ca2bd213d694d3a5cb08a08890609
--- lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
+++ lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision d55428a1d82ca2bd213d694d3a5cb08a08890609)
@@ -27,7 +27,7 @@
 	</tr>
 </table>
 
-<c:url value="/teacher.do" var="authoringUrl">
+<c:url value="../learning/teacher.do" var="authoringUrl">
 	<c:param name="contentFolderID" value="${contentFolderID}" />
 	<c:param name="toolContentID" value="${toolContentID}" />
 </c:url>