Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(.../LamsAuthoringFinishAction.java)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -39,115 +39,147 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.tool.IToolVO;
+import org.lamsfoundation.lams.tool.Tool;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- * This action class does some process when author try to save/cancel/close authoring tool pages.
- * If author try to save tool page, this action will redirct tool page to confirm page and execute clearSession() method.
- * If author try to cancel/close window, this action will execute clearSession().
- *  
+ * This action class does some process when author try to save/cancel/close authoring tool pages. If author try to save
+ * tool page, this action will redirct tool page to confirm page and execute clearSession() method. If author try to
+ * cancel/close window, this action will execute clearSession().
+ * 
  * @author Steve.Ni
  * 
  * @version $Revision$
  */
 public abstract class LamsAuthoringFinishAction extends Action {
-	 private static Logger log = Logger.getLogger(LamsAuthoringFinishAction.class);
-	 
-	private static final String ACTION_NAME = "action";
-	private static final String ACTION_MODE = "mode";
-	private static final String CUSTOMISE_SESSION_ID = "customiseSessionID";
-	private static final String TOOL_SIGNATURE = "signature";
-	
-	private static final String CONFIRM_ACTION = "confirm";
-	private static final String CANCEL_ACTION = "cancel";
+    private static Logger log = Logger.getLogger(LamsAuthoringFinishAction.class);
 
-	private static final String RE_EDIT_URL = "reEditUrl";
+    private static final String ACTION_NAME = "action";
+    private static final String ACTION_MODE = "mode";
+    private static final String CUSTOMISE_SESSION_ID = "customiseSessionID";
+    private static final String TOOL_SIGNATURE = "signature";
 
-	private static final String PARAM_DEFINE_LATER = "defineLater";
-	
-	/**
-	 * Action method, will handle save/cancel action.
-	 */
-	public ActionForward execute(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-		String action = request.getParameter(ACTION_NAME);
-		String modeStr = request.getParameter(ACTION_MODE);
-		String cSessionID = request.getParameter(CUSTOMISE_SESSION_ID);
+    private static final String CONFIRM_ACTION = "confirm";
+    private static final String CANCEL_ACTION = "cancel";
 
-		//clear session according to the ToolAccessMode.
-		if(StringUtils.equals(ToolAccessMode.LEARNER.toString(),modeStr))
-			clearSession(cSessionID,request.getSession(),ToolAccessMode.LEARNER);
-		else if(StringUtils.equals(ToolAccessMode.TEACHER.toString(),modeStr))
-			clearSession(cSessionID,request.getSession(),ToolAccessMode.TEACHER);
-		else //if(StringUtils.equals(ToolAccessMode.AUTHOR.toString(),modeStr)) : default value
-			clearSession(cSessionID,request.getSession(),ToolAccessMode.AUTHOR);
-		
-		if(StringUtils.equals(action,CONFIRM_ACTION)){
-			String nextUrl = getLamsUrl() + "authoringConfirm.jsp";
-			String signature = request.getParameter(TOOL_SIGNATURE);
-			Long toolContentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-			
-			String contentFolderID = "TODO_remove-change_optional_to_false";
-			contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID, true);
+    private static final String RE_EDIT_URL = "reEditUrl";
 
-			//check whether it use on define it later page
-			IToolVO tool = getToolService().getToolBySignature(signature);
-			String defineLater = request.getParameter(PARAM_DEFINE_LATER);
-			
-			String reeditUrl;
-			if(StringUtils.equalsIgnoreCase(defineLater,"yes") 
-				|| StringUtils.equalsIgnoreCase(defineLater,"true")){
-				//define it later page
-				reeditUrl = WebUtil.appendParameterToURL(getLamsUrl()+tool.getDefineLaterUrl(), AttributeNames.PARAM_TOOL_CONTENT_ID,
-						toolContentId.toString());
-				reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID,
-						contentFolderID);
-								
-			}else{
-				//authoring page
-				reeditUrl = WebUtil.appendParameterToURL(getLamsUrl()+tool.getAuthorUrl(), AttributeNames.PARAM_TOOL_CONTENT_ID,
-						toolContentId.toString());
-				reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID,
-						contentFolderID);
-			}
-			
-			nextUrl = WebUtil.appendParameterToURL(nextUrl,RE_EDIT_URL,URLEncoder.encode(reeditUrl,"UTF-8"));
-			response.sendRedirect(nextUrl);
-		}
-		if(StringUtils.equals(action,CANCEL_ACTION)){
-		}
-		return null;
+    private static final String PARAM_DEFINE_LATER = "defineLater";
+
+    /**
+     * Action method, will handle save/cancel action.
+     */
+    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	String action = request.getParameter(ACTION_NAME);
+	String modeStr = request.getParameter(ACTION_MODE);
+	String cSessionID = request.getParameter(CUSTOMISE_SESSION_ID);
+
+	// clear session according to the ToolAccessMode.
+	if (StringUtils.equals(ToolAccessMode.LEARNER.toString(), modeStr))
+	    clearSession(cSessionID, request.getSession(), ToolAccessMode.LEARNER);
+	else if (StringUtils.equals(ToolAccessMode.TEACHER.toString(), modeStr))
+	    clearSession(cSessionID, request.getSession(), ToolAccessMode.TEACHER);
+	else
+	    // if(StringUtils.equals(ToolAccessMode.AUTHOR.toString(),modeStr)) : default value
+	    clearSession(cSessionID, request.getSession(), ToolAccessMode.AUTHOR);
+
+	if (StringUtils.equals(action, CONFIRM_ACTION)) {
+	    String nextUrl = getLamsUrl() + "authoringConfirm.jsp";
+	    String signature = request.getParameter(TOOL_SIGNATURE);
+	    Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+
+	    String contentFolderID = "TODO_remove-change_optional_to_false";
+	    contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID, true);
+
+	    // check whether it use on define it later page
+	    IToolVO tool = getToolService().getToolBySignature(signature);
+	    String defineLater = request.getParameter(PARAM_DEFINE_LATER);
+
+	    String reeditUrl;
+	    if (StringUtils.equalsIgnoreCase(defineLater, "yes") || StringUtils.equalsIgnoreCase(defineLater, "true")) {
+		// define it later page
+		reeditUrl = WebUtil.appendParameterToURL(getLamsUrl() + tool.getDefineLaterUrl(),
+			AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId.toString());
+		reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID,
+			contentFolderID);
+
+	    } else {
+		// authoring page
+		reeditUrl = WebUtil.appendParameterToURL(getLamsUrl() + tool.getAuthorUrl(),
+			AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId.toString());
+		reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID,
+			contentFolderID);
+	    }
+	    tool.getServiceName();
+	    nextUrl = WebUtil.appendParameterToURL(nextUrl, RE_EDIT_URL, URLEncoder.encode(reeditUrl, "UTF-8"));
+	    response.sendRedirect(nextUrl);
 	}
-	/**
-	 * All subclass will implements this method and execute clear <code>HttpSession</code> action to 
-	 * remove obsolete session values.
-	 * 
-	 * @param customiseSessionID customised session ID.
-	 * @param session
-	 * @param mode ToolAccessMode to decide which role's session will be clear.
-	 */
-	abstract public void clearSession(String customiseSessionID,HttpSession session, ToolAccessMode mode);
-	
-	private String getLamsUrl(){
-		String serverURL = Configuration.get(ConfigurationKeys.SERVER_URL);
-		
-   		if ( StringUtils.isBlank(serverURL) ) {
-	   		log.warn("ServerURLTag unable to write out server URL as it is missing from the configuration file.");
-   		}
-   		
-   		return serverURL;
+	if (StringUtils.equals(action, CANCEL_ACTION) || StringUtils.equals(ToolAccessMode.TEACHER.toString(), modeStr)) {
+	    String signature = request.getParameter(TOOL_SIGNATURE);
+	    Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+
+	    ToolContentManager contentManager = (ToolContentManager) findToolService(signature);
+	    contentManager.setAsDefineLater(toolContentId, false);
 	}
+
+	return null;
+    }
+
+    /**
+     * All subclass will implements this method and execute clear <code>HttpSession</code> action to remove obsolete
+     * session values.
+     * 
+     * @param customiseSessionID
+     *            customised session ID.
+     * @param session
+     * @param mode
+     *            ToolAccessMode to decide which role's session will be clear.
+     */
+    abstract public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode);
 	
-	
-	public ILamsToolService getToolService(){
-		WebApplicationContext webContext = WebApplicationContextUtils.getRequiredWebApplicationContext(this.getServlet().getServletContext());
-		return (ILamsToolService) webContext.getBean(AuthoringConstants.TOOL_SERVICE_BEAN_NAME);		
+    // ---------------------------------------------------------------------
+    // Helper Methods
+    // ---------------------------------------------------------------------
+
+    private String getLamsUrl() {
+	String serverURL = Configuration.get(ConfigurationKeys.SERVER_URL);
+
+	if (StringUtils.isBlank(serverURL)) {
+	    log.warn("ServerURLTag unable to write out server URL as it is missing from the configuration file.");
 	}
+
+	return serverURL;
+    }
+
+    public ILamsToolService getToolService() {
+	WebApplicationContext webContext = WebApplicationContextUtils.getRequiredWebApplicationContext(this
+		.getServlet().getServletContext());
+	return (ILamsToolService) webContext.getBean(AuthoringConstants.TOOL_SERVICE_BEAN_NAME);
+    }
+
+    /**
+     * Find a tool's service registered inside lams.
+     * 
+     * @param signature
+     *            the tool signature.
+     * @return the service object from tool.
+     * @throws NoSuchBeanDefinitionException
+     *             if the tool is not the classpath or the supplied service name is wrong.
+     */
+    public Object findToolService(String signature) throws NoSuchBeanDefinitionException {
+	IToolVO tool = getToolService().getToolBySignature(signature);
+	WebApplicationContext webContext = WebApplicationContextUtils.getRequiredWebApplicationContext(this
+		.getServlet().getServletContext());
+	return webContext.getBean(tool.getServiceName());
+    }	
 }
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -re074865bde063cd3ac9e531a90857d07de9d121c -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision e074865bde063cd3ac9e531a90857d07de9d121c)
+++ lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_learning/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r03c8964e39bdf13d230084187d2b5e0f42df3193 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 03c8964e39bdf13d230084187d2b5e0f42df3193)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -81,7 +81,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -77,7 +77,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -73,7 +73,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")) {
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -74,7 +74,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -82,7 +82,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_www/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -ra7dbc1261f766307539edfdf26ec2a09903bb53e
--- lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a7dbc1261f766307539edfdf26ec2a09903bb53e)
@@ -72,7 +72,7 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;