Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java,v
diff -u -r1.2 -r1.3
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	5 Jun 2006 15:41:57 -0000	1.2
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	11 Jul 2006 00:59:23 -0000	1.3
@@ -62,6 +62,7 @@
 	 
 	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";
@@ -78,12 +79,13 @@
 			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);
 		if(StringUtils.equals(ToolAccessMode.AUTHOR.toString(),modeStr))
-			clearSession(request.getSession(),ToolAccessMode.AUTHOR);
+			clearSession(cSessionID,request.getSession(),ToolAccessMode.AUTHOR);
 		if(StringUtils.equals(ToolAccessMode.LEARNER.toString(),modeStr))
-			clearSession(request.getSession(),ToolAccessMode.LEARNER);
+			clearSession(cSessionID,request.getSession(),ToolAccessMode.LEARNER);
 		if(StringUtils.equals(ToolAccessMode.TEACHER.toString(),modeStr))
-			clearSession(request.getSession(),ToolAccessMode.TEACHER);
+			clearSession(cSessionID,request.getSession(),ToolAccessMode.TEACHER);
 		if(StringUtils.equals(action,CONFIRM_ACTION)){
 			String nextUrl = getLamsUrl() + "authoringConfirm.jsp";
 			String signature = request.getParameter(TOOL_SIGNATURE);
@@ -116,10 +118,11 @@
 	 * 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(HttpSession session, ToolAccessMode mode);
+	abstract public void clearSession(String customiseSessionID,HttpSession session, ToolAccessMode mode);
 	
 	private String getLamsUrl(){
 		String serverURL = Configuration.get(ConfigurationKeys.SERVER_URL);
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.6 -r1.7
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	21 Jun 2006 04:35:17 -0000	1.6
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	11 Jul 2006 00:59:23 -0000	1.7
@@ -45,6 +45,7 @@
 <%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
+<%@ attribute name="customiseSessionID" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty cancelButtonLabelKey}">
@@ -63,14 +64,14 @@
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}'/>";
+       	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}'/>";
 	}
     function doSubmit_Form_Only() {
     	document.getElementById("${formID}").submit();
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}&customiseSessionID=${customiseSessionID}'/>";
         	//just for depress alert window when call window.close()
         	//only available for IE browser
         	var userAgent=navigator.userAgent;
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java	16 May 2006 02:45:45 -0000	1.1
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java	11 Jul 2006 00:55:50 -0000	1.2
@@ -41,7 +41,7 @@
 public class ClearSessionAction extends LamsAuthoringFinishAction {
 
 	@Override
-	public void clearSession(HttpSession session, ToolAccessMode mode) {
+	public void clearSession(String customiseSessionID,HttpSession session, ToolAccessMode mode) {
 		if(mode.isAuthor()){
 //			session.removeAttribute(QaAction.SUBMIT_SUCCESS);
 		}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java	24 Jun 2006 23:36:32 -0000	1.3
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java	11 Jul 2006 00:57:22 -0000	1.4
@@ -41,7 +41,7 @@
  */
 public class ClearSessionAction extends LamsAuthoringFinishAction {
 
-	public void clearSession(HttpSession session, ToolAccessMode mode) {
+	public void clearSession(String customiseSessionID,HttpSession session, ToolAccessMode mode) {
 		//only this tool save LAMS_AUTHORING_SUCCESS_FLAG into session, remove it!!!
 		session.removeAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG);
 		if(mode.isAuthor()){
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java	12 May 2006 05:14:43 -0000	1.2
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java	11 Jul 2006 00:57:53 -0000	1.3
@@ -40,7 +40,7 @@
 public class ClearSessionAction extends LamsAuthoringFinishAction {
 
 	@Override
-	public void clearSession(HttpSession session, ToolAccessMode mode) {
+	public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode) {
 		if(mode.isAuthor()){
 			session.removeAttribute(AttributeNames.ATTR_MODE);
 			session.removeAttribute(ResourceConstants.ATTR_TOOL_CONTENT_ID);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ClearSessionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ClearSessionAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ClearSessionAction.java	12 May 2006 06:34:09 -0000	1.1
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ClearSessionAction.java	11 Jul 2006 00:58:26 -0000	1.2
@@ -40,7 +40,7 @@
 public class ClearSessionAction extends LamsAuthoringFinishAction {
 
 	@Override
-	public void clearSession(HttpSession session, ToolAccessMode mode) {
+	public void clearSession(String customiseSessionID,HttpSession session, ToolAccessMode mode) {
 		if(mode.isAuthor()){
 			session.removeAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID);
 			session.removeAttribute(SbmtConstants.ATTACHMENT_LIST);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java,v
diff -u -r1.4 -r1.5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java	23 May 2006 13:28:28 -0000	1.4
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java	11 Jul 2006 00:58:44 -0000	1.5
@@ -41,7 +41,7 @@
 public class ClearSessionAction extends LamsAuthoringFinishAction implements VoteAppConstants {
 
 
-	public void clearSession(HttpSession session, ToolAccessMode mode) {
+	public void clearSession(String customiseSessionID,HttpSession session, ToolAccessMode mode) {
 	    session.removeAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG);
 		if(mode.isAuthor()){
 		    session.removeAttribute(TOOL_SERVICE);