Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java,v
diff -u -r1.9 -r1.10
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	23 Jun 2006 06:35:54 -0000	1.9
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	13 Jul 2006 00:20:01 -0000	1.10
@@ -140,11 +140,6 @@
 		// add the sessionMap to HTTPSession.
 		request.getSession().setAttribute(map.getSessionID(), map);
 
-		// add the sessionMap to the HttpServletRequest
-		// TODO workaround until we can figure out how to get request
-		// attributes using dynamic attributes in jsps.
-		request.setAttribute(ChatConstants.ATTR_SESSION_MAP, map);
-
 		return mapping.findForward("success");
 	}
 
@@ -192,6 +187,9 @@
 
 		request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,
 				Boolean.TRUE);
+		
+		// add the sessionMapID to form
+		authForm.setSessionMapID(map.getSessionID());
 
 		return mapping.findForward("success");
 	}
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.2 -r1.3
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java	11 Jul 2006 00:55:50 -0000	1.2
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java	13 Jul 2006 00:20:01 -0000	1.3
@@ -43,7 +43,7 @@
 	@Override
 	public void clearSession(String customiseSessionID,HttpSession session, ToolAccessMode mode) {
 		if(mode.isAuthor()){
-//			session.removeAttribute(QaAction.SUBMIT_SUCCESS);
+			session.removeAttribute(customiseSessionID);
 		}
 	}
 
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	21 Jun 2006 04:33:41 -0000	1.3
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	13 Jul 2006 00:20:02 -0000	1.4
@@ -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/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/authoring.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_chat/web/pages/authoring/authoring.jsp	23 Jun 2006 06:35:54 -0000	1.7
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	13 Jul 2006 00:20:02 -0000	1.8
@@ -31,17 +31,16 @@
 		<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
 		<lams:TabBody id="3" titleKey="button.instructions" page="instructions.jsp" />
 
+		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+		<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}"/>	
+
 		<c:set var="defineLater" value="no" />
-		<c:if test="${requestScope.sessionMap.mode == 'teacher'}">
+		<c:if test="${sessionMap.mode == 'teacher'}">
 			<c:set var="defineLater" value="yes" />
 		</c:if>
-
-		<%-- Form Controls --%>
-		<!-- Button Row -->
-
-		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+		
 		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lachat11" cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save" toolContentID="${formBean.toolContentID}"
-			accessMode="${requestScope.sessionMap.mode}" defineLater="${defineLater}" />
+			accessMode="${sessionMap.mode}" defineLater="${defineLater}" customiseSessionID="${sessionMap.sessionID}"/>
 
 	</html:form>
 </div>