Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -r4f31d486962570403f0aad6d99f20000ee1432f6 -r6107b0b2e367c55582da60a59adf70b55e647de6
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(.../AuthoringController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(.../AuthoringController.java)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -107,6 +107,7 @@
     @Autowired
     @Qualifier("userManagementService")
     private IUserManagementService userManagementService;
+    @Autowired
     private  ILamsToolService toolService;
     @Autowired
     @Qualifier("authoringService")
Index: lams_central/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -8,7 +8,7 @@
            				   http://www.springframework.org/schema/context 
    						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 	<!-- Spring MVC -->
-	<context:component-scan base-package="org.lamsfoundation.lams.web, org.lamsfoundation.lams.authoring.web" />
+	<context:component-scan base-package="org.lamsfoundation.lams.web, org.lamsfoundation.lams.authoring" />
 	
 	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
 		<property name="prefix" value="/" />
Index: lams_central/web/authoring/template/comms.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -103,7 +103,7 @@
 		}
 		
 		function getSubmissionURL() {
-			return '<lams:WebAppURL />/authoring/template/'+$('#template').val().toLowerCase()+'.do';
+			return '<lams:WebAppURL />'+$('#template').val().toLowerCase()+'.do';
 		}
 		
 		function doGotoList() {
Index: lams_central/web/authoring/template/list.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/authoring/template/list.jsp	(.../list.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/authoring/template/list.jsp	(.../list.jsp)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -22,7 +22,7 @@
 <lams:Page type="admin" title="${title}">
 <p><fmt:message key="authoring.template.list.introduction"/></p>
 <table class="table table-striped table-bordered">
-<tr><td><a href="${lams}authoring/template/tbl/init.do"><fmt:message key="authoring.tbl.template.title"/></a> - <fmt:message key="authoring.tbl.template.description"/></td></tr>
+<tr><td><a href="${lams}tbl/init.do"><fmt:message key="authoring.tbl.template.title"/></a> - <fmt:message key="authoring.tbl.template.description"/></td></tr>
 </table>
 <div class="button-group voffset10">
 <a href="#" id="cancelButton" class="btn btn-default btn-sm pull-left" onclick="javascript:closeWindow()"><span class="cancelIcon"><fmt:message key="button.cancel"/></span></a>
Index: lams_central/web/editLessonIntro.jsp
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/editLessonIntro.jsp	(.../editLessonIntro.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/editLessonIntro.jsp	(.../editLessonIntro.jsp)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -37,7 +37,7 @@
 <body class="stripes">
 	
 	<lams:Page type="admin">		
-		<form action="editLessonIntro.do?method=save" method="post" id="lessonForm">
+		<form action="editLessonIntro/save.do" method="post" id="lessonForm">
 			<input type="hidden" name="lessonID" value="${lesson.lessonId}"/>
 	
 			<div class="field-group">
Index: lams_central/web/emailuser.jsp
===================================================================
diff -u -ra127989b08183726fcbb9956721eff6553c4a0eb -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/emailuser.jsp	(.../emailuser.jsp)	(revision a127989b08183726fcbb9956721eff6553c4a0eb)
+++ lams_central/web/emailuser.jsp	(.../emailuser.jsp)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -101,7 +101,7 @@
 			</c:if>
 			<div class="panel-body">
 				<form id="emailUserForm"
-					action="<lams:LAMSURL/>emailUser.do?method=send" method="post">
+					action="<lams:LAMSURL/>emailUser/send.do" method="post">
 					<c:if test="${not empty user}">
 						<input type="hidden" name="userId" value="${user.userId}" />
 					</c:if>
Index: lams_central/web/forgotPassword.jsp
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -85,9 +85,8 @@
 <body class="stripes" onload="radioSelected();">
 
 	<lams:Page type="admin" title="${title}">
-		<form action="<lams:LAMSURL/>/ForgotPasswordRequest" method="post"
+		<form action="<lams:LAMSURL/>ForgotPasswordRequest/requestEmail.do" method="post"
 			name="forgotForm">
-			<input type="hidden" name="method" id="method" value="requestEmail" />
 
 			<h4 class="no-tabs-below">
 				<fmt:message key="label.forgot.password" />
Index: lams_central/web/forgotPasswordChange.jsp
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/forgotPasswordChange.jsp	(.../forgotPasswordChange.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/forgotPasswordChange.jsp	(.../forgotPasswordChange.jsp)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -103,10 +103,9 @@
 
 <body class="stripes">
 	<lams:Page type="admin" title="${title}">
-		<form action="<lams:LAMSURL/>/ForgotPasswordRequest" method="post"
+		<form action="<lams:LAMSURL/>ForgotPasswordRequest/requestPasswordChange.do" method="post"
 			name="changePass">
-			<input type="hidden" name="method" id="method"
-				value="requestPasswordChange" /> <input type="hidden" name="key"
+				<input type="hidden" name="key"
 				id="key" value="<c:out value='${param.key}' />" />
 
 			<h4>
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -350,10 +350,9 @@
 			$.ajax({
 				cache : false,
 				async : false,
-				url : LAMS_URL + "workspace.do",
+				url : LAMS_URL + "workspace/createFolder.do",
 				dataType : 'text',
 				data : {
-					'method'         : 'createFolder',
 					'name' 		     : title,
 					'parentFolderID' : parentFolder.data.folderID
 				},
@@ -413,10 +412,9 @@
 
 			$.ajax({
 				cache : false,
-				url : LAMS_URL + "workspace.do",
+				url : copiedResource.isCut ? 'LAMS_URL + "workspace/moveResource.do' : 'LAMS_URL + "workspace/copyResource.do',
 				dataType : 'text',
 				data : {
-					'method'         : copiedResource.isCut ? 'moveResource' : 'copyResource',
 					'targetFolderID' : folderNode.data.folderID,
 					'resourceID'     : copiedResource.isFolder ? copiedResource.resourceNode.data.folderID
 															   : copiedResource.resourceNode.data.learningDesignId ,
@@ -456,10 +454,9 @@
 			$.ajax({
 				cache : false,
 				async : false,
-				url : LAMS_URL + "workspace.do",
+				url : LAMS_URL + "workspace/deleteResource.do",
 				dataType : 'text',
 				data : {
-					'method'       : 'deleteResource',
 					'resourceID'   : isFolder? ldNode.data.folderID : ldNode.data.learningDesignId,
 					'resourceType' : isFolder ? 'Folder' : 'LearningDesign'
 				},
@@ -511,10 +508,9 @@
 			$.ajax({
 				cache : false,
 				async : false,
-				url : LAMS_URL + "workspace.do",
+				url : LAMS_URL + "workspace/renameResource.do",
 				dataType : 'text',
 				data : {
-					'method'       : 'renameResource',
 					'name' 		   : title,
 					'resourceID'   : isFolder? ldNode.data.folderID : ldNode.data.learningDesignId,
 					'resourceType' : isFolder ? 'Folder' : 'LearningDesign'
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r1c001afed4496daabc08f0b83a4118458d400e5a -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 1c001afed4496daabc08f0b83a4118458d400e5a)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -250,7 +250,7 @@
 			'modal'	   : true,
 			'title'	   : LABELS.EXPORT_SEQUENCE_DIALOG_TITLE,
 			'open'	   : function() {
-				$('iframe', this).attr('src', LAMS_URL + 'authoring/exportToolContent.do?method=export&learningDesignID='
+				$('iframe', this).attr('src', LAMS_URL + 'authoring/exportToolContent/export.do?learningDesignID='
 									  	  			   + layout.ld.learningDesignID);
 			}
 		}, false)
@@ -432,7 +432,7 @@
 						'open' : function() {
 							var dialog = $(this);
 							// load contents after opening the dialog
-							$('iframe', dialog).attr('src', LAMS_URL + 'authoring/importToolContent.do?method=import').load(function(){
+							$('iframe', dialog).attr('src', LAMS_URL + 'authoring/importToolContent/import.do').load(function(){
 								// override the close function so it works with the dialog, not window
 								this.contentWindow.closeWin = function(){
 									dialog.modal('hide');
@@ -520,9 +520,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' : layout.ld.learningDesignID,
 				'copyType' : 3,
 				'lessonName' : LABELS.PREVIEW_LESSON_DEFAULT_TITLE
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -rb7aef118db71bf93f74bf91c76fbd4e59de37dff -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision b7aef118db71bf93f74bf91c76fbd4e59de37dff)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -86,7 +86,7 @@
 }
 
 function openLearner( lessonId ) {
-	var learnerUrl = '../home/learner.do?lessonID=' + lessonId;
+	var learnerUrl = '/lams/home/learner.do?lessonID=' + lessonId;
 	
 	if (isMac) {
 		learnWin = window.open(learnerUrl,'lWindow','width=' + learner_width + ',height=' + learner_height 
Index: lams_central/web/includes/javascript/orgGroup.js
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -339,9 +339,8 @@
 				async    : false,
 				cache    : false,
 				dataType : 'json',
-				url : LAMS_URL + 'monitoring/grouping.do',
+				url : LAMS_URL + 'monitoring/grouping/removeGroup.do',
 				data : {
-					'method'     : 'removeGroup',
 					'activityID' : groupingActivityId,
 					'groupID'    : groupId
 				},
@@ -371,9 +370,8 @@
 		var groupName = nameInput.val();
 		$.ajax({
 			cache    : false,
-			url : LAMS_URL + 'monitoring/grouping.do',
+			url : LAMS_URL + 'monitoring/grouping/changeGroupName.do',
 			data : {
-				'method'     : 'changeGroupName',
 				'groupID'    : groupId,
 				'name'       : groupName
 			},
@@ -403,11 +401,10 @@
 	var isGroupingNameUnique = false;
 	$.ajax({
 		dataType : 'json',
-		url : LAMS_URL + 'monitoring/grouping.do',
+		url : LAMS_URL + 'monitoring/grouping/checkGroupingNameUnique.do',
 		cache : false,
 		async : false,
 		data : {
-			'method'    : 'checkGroupingNameUnique',
 			'organisationID' : grouping.organisationId,
 			'name'  : groupingName
 		},		
@@ -491,9 +488,8 @@
 		async    : false,
 		cache    : false,
 		dataType : 'json',
-		url : LAMS_URL + 'monitoring/grouping.do',
+		url : LAMS_URL + 'monitoring/grouping/addMembers.do',
 		data : {
-			'method'     : 'addMembers',
 			'activityID' : groupingActivityId,
 			'groupID'    : groupId,
 			'name'       : groupName,
@@ -532,7 +528,7 @@
  * Show a printable version of the groups. Open the same size as the current window
  */
 function showPrintPage() {
-	var url = LAMS_URL + '/monitoring/grouping.do?method=printGrouping';
+	var url = LAMS_URL + '/monitoring/grouping/printGrouping.do';
 	if ( groupingActivityId )
 		url += '&activityID='+groupingActivityId;
 	if ( lessonId )
@@ -605,11 +601,10 @@
 				var isGroupingNameUnique = false;
 				$.ajax({
 					dataType : 'json',
-					url : LAMS_URL + 'monitoring/grouping.do',
+					url : LAMS_URL + 'monitoring/grouping/checkGroupingNameUnique.do',
 					cache : false,
 					async : false,
 					data : {
-						'method'    : 'checkGroupingNameUnique',
 						'organisationID' : grouping.organisationId,
 						'name'  : groupingName
 					},		
@@ -718,7 +713,7 @@
 			}
 		}, 1000);
 				
-		var url = LAMS_URL + "groupingUpload.do?method=getGroupTemplateFile&activityID="+groupingActivityId
+		var url = LAMS_URL + "groupingUpload/getGroupTemplateFile.do?activityID="+groupingActivityId
 		+"&organisationID="+organisationId+"&lessonID="+lessonId+"&downloadTokenValue=" + token;
 		if ( grouping && grouping.groupingId) {
 			url += "&groupingId=" + grouping.groupingId;
@@ -785,23 +780,21 @@
 		//name should be unique
 		$.ajax({
 			dataType : 'json',
-			url : LAMS_URL + 'monitoring/grouping.do',
+			url : LAMS_URL + 'monitoring/grouping/checkGroupingNameUnique.do',
 			cache : false,
 			async : false,
 			data : {
-				'method'    : 'checkGroupingNameUnique',
 				'organisationID' : organisationId,
 				'name'  : name
 			},		
 			success : function(response) {
 				if (response.isGroupingNameUnique) {
 					$.ajax({
 						dataType : 'json',
-						url : LAMS_URL + 'monitoring/grouping.do',
+						url : LAMS_URL + 'monitoring/grouping/saveAsCourseGrouping.do',
 						cache : false,
 						async : false,
 						data : {
-							'method'    : 'saveAsCourseGrouping',
 							'organisationID' : organisationId,
 							'activityID' : groupingActivityId,
 							'name'  : name
Index: lams_central/web/includes/javascript/pedagogicalPlanner.js
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/includes/javascript/pedagogicalPlanner.js	(.../pedagogicalPlanner.js)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/includes/javascript/pedagogicalPlanner.js	(.../pedagogicalPlanner.js)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -201,7 +201,7 @@
   	   		}
   	   	}
   	   	else if (actionAfterCompleted==ACTION_EXPORT){
-  	   		 document.getElementById("downloadFileDummyIframe").src="pedagogicalPlanner.do?method=exportTemplate&ldId="+learningDesignId;
+  	   		 document.getElementById("downloadFileDummyIframe").src="pedagogicalPlanner/exportTemplate.do?ldId="+learningDesignId;
   	   	}
   	}
   	else {
Index: lams_central/web/main.jsp
===================================================================
diff -u -ra127989b08183726fcbb9956721eff6553c4a0eb -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/main.jsp	(.../main.jsp)	(revision a127989b08183726fcbb9956721eff6553c4a0eb)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -100,8 +100,7 @@
 		$(document).ready(function(){
 			<%-- If it's the user's first login, display a dialog asking if tutorial videos should be shown --%>
 			<c:if test="${firstLogin}">
-				<c:url var="disableAllTutorialVideosUrl" value="tutorial.do">
-					<c:param name="method" value="disableAllTutorialVideos" />
+				<c:url var="disableAllTutorialVideosUrl" value="tutorial/disableAllTutorialVideos.do">
 				</c:url>
 				if (!confirm("<fmt:message key='label.tutorial.disable.all' />")){
 			 		$.get("${disableAllTutorialVideosUrl}");
Index: lams_central/web/signup/loginTab.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/signup/loginTab.jsp	(.../loginTab.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/signup/loginTab.jsp	(.../loginTab.jsp)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -1,6 +1,5 @@
 <body>
-	<form:form id="SignupForm" modelAttribute="SignupForm" action="/lams/signup/signup.do" method="post" autocomplete="off" >
- 		<form:hidden path="method" value="login" />
+	<form:form id="SignupForm" modelAttribute="SignupForm" action="/lams/signup/signup/login.do" method="post" autocomplete="off" >
 		<form:hidden path="submitted" value="1" />
 		<form:hidden path="context" value="${signupOrganisation.context}" />
 		<form:hidden path="selectedTab" value="1" />
Index: lams_central/web/toolcontent/importresult.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/toolcontent/importresult.jsp	(.../importresult.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/toolcontent/importresult.jsp	(.../importresult.jsp)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -61,7 +61,7 @@
 			</c:otherwise>
 		</c:choose>
 		<div class="voffset10">
-			<a href="importToolContent.do?method=import" class="btn btn-default pull-left"><fmt:message
+			<a href="importToolContent/import.do" class="btn btn-default pull-left"><fmt:message
 						key="button.select.another.importfile" /></a> <a href="javascript:;" onclick="closeWin();" class="btn btn-primary pull-right"><fmt:message key="button.close" /></a>
 		</div>
 
Index: lams_central/web/tutorialVideo.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_central/web/tutorialVideo.jsp	(.../tutorialVideo.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/tutorialVideo.jsp	(.../tutorialVideo.jsp)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -1,7 +1,6 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<c:url var="tutorialActionUrl" value="tutorial.do" />
 
 <!DOCTYPE html>
 <html>
@@ -21,8 +20,8 @@
 			 		if (! $("#doNotShowAgain").attr("checked")){
 				 		$.ajax({		
 							type: "GET",
-							url: "${tutorialActionUrl}",
-							data: {method : "enableSingleTutorialVideo", pageString : "${param.pageString}"},
+							url: "tutorial/enableSingleTutorialVideo.do",
+							data: {pageString : "${param.pageString}"},
 							cache: false
 						});
 			 		}
@@ -33,8 +32,8 @@
 			 			
 				 		$.ajax({		
 							type: "GET",
-							url: "${tutorialActionUrl}",
-							data: {method : "disableSingleTutorialVideo", pageString : "${param.pageString}"},
+							url: "tutorial/disableSingleTutorialVideo.do",
+							data: {pageString : "${param.pageString}"},
 							cache: false
 						});
 			 		}
@@ -53,8 +52,8 @@
 				   That's why we need to check it each time we enter this thickbox.
 				*/
 	 			$.get(
-	 				"${tutorialActionUrl}",
-					{method : "getDoNotShowAgainValue", pageString : "${param.pageString}"},
+	 				"tutorial/getDoNotShowAgainValue.do",
+					{pageString : "${param.pageString}"},
 					function (data, textStatus) {
 						// Comparing with "==" did not work
 						doNotShowAgainInitialValue = data.indexOf("true")>-1;
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -4,6 +4,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
@@ -88,8 +89,8 @@
 					</c:if>
 				</c:if>
 			</c:if>
-			<c:if test="${empty toolSessionId}">
-				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<c:if test="${empty toolSessionId and not empty formID}">
+				<c:set var="toolForm" value="${requestScope[formID]}" />
 				<c:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
 				</c:if>
@@ -137,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -244,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
+</c:choose>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r169ce779d0f88147f00cffb353f45f595b8c1a7c -r6107b0b2e367c55582da60a59adf70b55e647de6
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 169ce779d0f88147f00cffb353f45f595b8c1a7c)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},