Index: lams_central/conf/language/ApplicationResources.properties
===================================================================
diff -u -r9209fbea485f8b0f28a7374629d7cd3d3398cf41 -r50d68fddcd33b33903cd4c0119f01080b9314b80
--- lams_central/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9209fbea485f8b0f28a7374629d7cd3d3398cf41)
+++ lams_central/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -34,4 +34,9 @@
 folder.already.exist=A folder with given name '{0}' already exists.
 can.not.rename.root.folder=Cannot rename the ROOT folder.
 organisations=Organisations
-folders=Folders
\ No newline at end of file
+folders=Folders
+
+
+authoring.msg.save.success=Congratulation, your content saved successfully!
+label.authoring.close=Close
+label.authoring.re.edit=Re-Edit
Index: lams_central/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rcdab8186de5e9c75a9d6774616ead602dbf9cb69 -r50d68fddcd33b33903cd4c0119f01080b9314b80
--- lams_central/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
+++ lams_central/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -1,6 +1,6 @@
 <context-param>
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.applicationResources</param-value>
+  	<param-value>org.lamsfoundation.lams.central.ApplicationResources</param-value>
 </context-param>
 
 <context-param> 
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java
===================================================================
diff -u -rde1940e60766f8901436c6ab567c692685d5b35c -r50d68fddcd33b33903cd4c0119f01080b9314b80
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java	(.../AuthoringConstants.java)	(revision de1940e60766f8901436c6ab567c692685d5b35c)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java	(.../AuthoringConstants.java)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -32,5 +32,6 @@
 
 	/** Spring context name for refering to the authoring service */
 	public static final String AUTHORING_SERVICE_BEAN_NAME = "authoringService";
-
+	public static final String TOOL_SERVICE_BEAN_NAME = "lamsToolService";
+	public static final String LAMS_AUTHORING_SUCCESS_FLAG = "LAMS_AUTHORING_SUCCESS_FLAG";
 }
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -0,0 +1,127 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.authoring.web;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.tool.IToolVO;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+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.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().
+ *  
+ * @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 TOOL_SIGNATURE = "signature";
+	
+	private static final String CONFIRM_ACTION = "confirm";
+	private static final String CANCEL_ACTION = "cancel";
+
+	private static final String RE_EDIT_URL = "reEditUrl";
+
+	
+	/**
+	 * 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);
+		if(StringUtils.equals(ToolAccessMode.AUTHOR.toString(),modeStr))
+			clearSession(request.getSession(),ToolAccessMode.AUTHOR);
+		if(StringUtils.equals(ToolAccessMode.LEARNER.toString(),modeStr))
+			clearSession(request.getSession(),ToolAccessMode.LEARNER);
+		if(StringUtils.equals(ToolAccessMode.TEACHER.toString(),modeStr))
+			clearSession(request.getSession(),ToolAccessMode.TEACHER);
+			
+		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));
+			IToolVO tool = getToolService().getToolBySignature(signature);
+			String reeditUrl = WebUtil.appendParameterToURL(getLamsUrl()+tool.getAuthorUrl(), AttributeNames.PARAM_TOOL_CONTENT_ID,
+					toolContentId.toString());
+			
+			nextUrl = WebUtil.appendParameterToURL(nextUrl,RE_EDIT_URL,URLEncoder.encode(reeditUrl,"UTF-8"));
+			response.sendRedirect(nextUrl);
+		}
+		if(StringUtils.equals(action,CANCEL_ACTION)){
+		}
+		return null;
+	}
+	/**
+	 * All subclass will implements this method and execute clear <code>HttpSession</code> action to 
+	 * remove obsolete session values.
+	 * 
+	 * @param session
+	 * @param mode ToolAccessMode to decide which role's session will be clear.
+	 */
+	abstract public void clearSession(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;
+	}
+	
+	
+	public ILamsToolService getToolService(){
+		WebApplicationContext webContext = WebApplicationContextUtils.getRequiredWebApplicationContext(this.getServlet().getServletContext());
+		return (ILamsToolService) webContext.getBean(AuthoringConstants.TOOL_SERVICE_BEAN_NAME);		
+	}
+}
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
diff -u -r1bf4c860120741c61f40cf9a03fc58e9e29e06eb -r50d68fddcd33b33903cd4c0119f01080b9314b80
--- lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 1bf4c860120741c61f40cf9a03fc58e9e29e06eb)
+++ lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -274,5 +274,9 @@
        <name>SetEditor</name>
        <path>/WEB-INF/tags/SetEditor.tag</path>
    	</tag-file>
+   	<tag-file>
+       <name>AuthoringButton</name>
+       <path>/WEB-INF/tags/AuthoringButton.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -0,0 +1,82 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * AuthoringButton.tag
+  *	Author: Dapeng Ni
+  *	Description: Creates the save/cancel button for authoring page
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+
+<%@ attribute name="formID" required="true" rtexprvalue="true" %>
+<%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
+<%@ attribute name="toolContentID" required="true" rtexprvalue="true" %>
+<%@ attribute name="clearSessionActionUrl" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty cancelButtonLabelKey}">
+	<c:set var="cancelButtonLabelKey" value="label.authoring.cancel.button" scope="request"/>
+</c:if>
+<c:if test="${empty saveButtonLabelKey}">
+	<c:set var="saveButtonLabelKey" value="label.authoring.save.button" scope="request"/>
+</c:if>
+<c:if test="${empty cancelConfirmMsgKey}">
+	<c:set var="cancelConfirmMsgKey" value="authoring.msg.cancel.save" scope="request"/>
+</c:if>
+
+<!-- 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=learner&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		}
+        function doSubmit() {
+        	document.getElementById("${formID}").submit();
+        }
+        function doCancel() {
+        	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+	        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=learner'/>";
+	        	//just for depress alert window when call window.close()
+	        	window.opener = "authoring"
+	        	window.close();
+			}
+        }  				
+</script>				
+<p align="right">
+	<html:link href="javascript:doSubmit();" property="submit" styleClass="button">
+		<fmt:message key="${saveButtonLabelKey}" /> 
+	</html:link>
+	<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button">
+		<fmt:message key="${cancelButtonLabelKey}" />
+	</html:link>
+</p>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -rcdab8186de5e9c75a9d6774616ead602dbf9cb69 -r50d68fddcd33b33903cd4c0119f01080b9314b80
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision cdab8186de5e9c75a9d6774616ead602dbf9cb69)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -3,7 +3,7 @@
 <web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
  <context-param>
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.applicationResources</param-value>
+  	<param-value>org.lamsfoundation.lams.central.ApplicationResources</param-value>
 </context-param>
 
 <context-param> 
Index: lams_central/web/authoringConfirm.jsp
===================================================================
diff -u
--- lams_central/web/authoringConfirm.jsp	(revision 0)
+++ lams_central/web/authoringConfirm.jsp	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -0,0 +1,34 @@
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<html>
+	<head>
+		<lams:css />
+		<script type="text/javascript">
+			  function closeWindow() {
+	        	window.opener = "authoring"
+	        	window.close();
+   	          }  				
+		</script>
+	</head>
+	<body>
+		<table border="0" cellspacing="5" cellpadding="5" width="90%" align="center">
+			<tr>
+				<td align="center">
+					<fmt:message key="authoring.msg.save.success" />
+				</td>
+			</tr>
+			<tr>
+				<td align="center">
+					<!-- Button Row -->
+					<html:link href="javascript:closeWindow();" property="close" styleClass="button">
+						<fmt:message key="label.authoring.close" />
+					</html:link>
+					<html:link href="${param.reEditUrl}" property="reedit" styleClass="button">
+						<fmt:message key="label.authoring.re.edit" />
+					</html:link>
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
Index: lams_central/web/css/default.css
===================================================================
diff -u -r4b570dc64026a2e5a1e0ffb972a358ff3f740d3e -r50d68fddcd33b33903cd4c0119f01080b9314b80
--- lams_central/web/css/default.css	(.../default.css)	(revision 4b570dc64026a2e5a1e0ffb972a358ff3f740d3e)
+++ lams_central/web/css/default.css	(.../default.css)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -71,6 +71,13 @@
 	text-align: left;
 }
 
+.error {
+        font-size: small;
+        color: red;
+        font-style: normal;
+        text-align: left;
+}
+
 /********* tab styles **********/
 /*tab styles*/
 .tab{
Index: lams_central/web/images/license/.cvsignore
===================================================================
diff -u
--- lams_central/web/images/license/.cvsignore	(revision 0)
+++ lams_central/web/images/license/.cvsignore	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -0,0 +1 @@
+Thumbs.db
Index: lams_tool_larsrc/.classpath
===================================================================
diff -u -r5d0efcab8441b253fc761272cbaeb62aa4f4a4ef -r50d68fddcd33b33903cd4c0119f01080b9314b80
--- lams_tool_larsrc/.classpath	(.../.classpath)	(revision 5d0efcab8441b253fc761272cbaeb62aa4f4a4ef)
+++ lams_tool_larsrc/.classpath	(.../.classpath)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -19,5 +19,6 @@
 	<classpathentry sourcepath="/lams_contentrepository" kind="lib" path="/lams_build/lib/lams/lams-contentrepository.jar"/>
 	<classpathentry sourcepath="/lams_common" kind="lib" path="/lams_build/lib/lams/lams.jar"/>
 	<classpathentry sourcepath="/lams_learning" kind="lib" path="/lams_build/lib/lams/lams-learning.jar"/>
+	<classpathentry sourcepath="/lams_central/src" kind="lib" path="/lams_build/lib/lams/lams-central.jar"/>
 	<classpathentry kind="output" path="web/WEB-INF/classes"/>
 </classpath>
Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
diff -u -rfc7f983fbdc263b826831b5b6f4839290f7ef964 -r50d68fddcd33b33903cd4c0119f01080b9314b80
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision fc7f983fbdc263b826831b5b6f4839290f7ef964)
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -1,6 +1,7 @@
 # CVS ID: $Id$ #
 # Language strings for the Share resources tool.
 # ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
+signature=larsrc11
 activity.title=Share Resources
 activity.description=Sharing resource with others.
 activity.helptext=Uploading your resources to share with others.
@@ -97,8 +98,9 @@
 error.msg.repository=Repository occurs exception while trying to upload file.
 error.msg.default.content.not.find=Could not retrieve default content record for this tool.
 
-authoring.save.success=Authoring save successfully.
 msg.no.instruction=No instruction available.
+authoring.msg.cancel.save=Do you want to exit without saving?
+
 #-------------------------END Authoring Labels END-----------------#
 #------------------------------Learner  ----------------------------------#
 label.learning.title=Share Resource Learning
Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r00546fef27c802810d1b2ac3d621f9c3e2d64cb0 -r50d68fddcd33b33903cd4c0119f01080b9314b80
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 00546fef27c802810d1b2ac3d621f9c3e2d64cb0)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -196,4 +196,8 @@
 			parameter="showitem" >
 			<forward name="success" path="/pages/monitoring/monitoring.jsp" />
 		</action>
+		<!-- ========== BEGIN: Common ============================== -->
+		<action path="/clearsession"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.ClearSessionAction">
+		</action>
 				
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r00546fef27c802810d1b2ac3d621f9c3e2d64cb0 -r50d68fddcd33b33903cd4c0119f01080b9314b80
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 00546fef27c802810d1b2ac3d621f9c3e2d64cb0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -55,6 +55,7 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
@@ -523,9 +524,7 @@
 			log.error(e);
 		}
 
-		ActionMessages messages = new ActionMessages();
-		messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("authoring.save.success"));
-		this.addMessages(request,messages);
+		request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
     	if(mode.isAuthor())
     		return mapping.findForward("author");
     	else
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java
===================================================================
diff -u
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java	(revision 0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -0,0 +1,47 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.tool.rsrc.web.action;
+
+import javax.servlet.http.HttpSession;
+
+import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
+
+
+public class ClearSessionAction extends LamsAuthoringFinishAction {
+
+	@Override
+	public void clearSession(HttpSession session, ToolAccessMode mode) {
+		session.removeAttribute(ResourceConstants.ATTR_TOOL_CONTENT_ID);
+		session.removeAttribute(ResourceConstants.ATT_ATTACHMENT_LIST);
+		session.removeAttribute(ResourceConstants.ATTR_DELETED_ATTACHMENT_LIST);
+		session.removeAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_LIST);
+		session.removeAttribute(ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_LIST);
+		session.removeAttribute(ResourceConstants.ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST);		
+	}
+
+		
+}
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -0,0 +1,82 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * AuthoringButton.tag
+  *	Author: Dapeng Ni
+  *	Description: Creates the save/cancel button for authoring page
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+
+<%@ attribute name="formID" required="true" rtexprvalue="true" %>
+<%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
+<%@ attribute name="toolContentID" required="true" rtexprvalue="true" %>
+<%@ attribute name="clearSessionActionUrl" required="true" rtexprvalue="true" %>
+
+<%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty cancelButtonLabelKey}">
+	<c:set var="cancelButtonLabelKey" value="label.authoring.cancel.button" scope="request"/>
+</c:if>
+<c:if test="${empty saveButtonLabelKey}">
+	<c:set var="saveButtonLabelKey" value="label.authoring.save.button" scope="request"/>
+</c:if>
+<c:if test="${empty cancelConfirmMsgKey}">
+	<c:set var="cancelConfirmMsgKey" value="authoring.msg.cancel.save" scope="request"/>
+</c:if>
+
+<!-- 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=learner&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+		}
+        function doSubmit() {
+        	document.getElementById("${formID}").submit();
+        }
+        function doCancel() {
+        	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+	        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=learner'/>";
+	        	//just for depress alert window when call window.close()
+	        	window.opener = "authoring"
+	        	window.close();
+			}
+        }  				
+</script>				
+<p align="right">
+	<html:link href="javascript:doSubmit();" property="submit" styleClass="button">
+		<fmt:message key="${saveButtonLabelKey}" /> 
+	</html:link>
+	<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button">
+		<fmt:message key="${cancelButtonLabelKey}" />
+	</html:link>
+</p>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r36d1e75abd559af0c4ec769ee5dd353f9ed4ffb7 -r50d68fddcd33b33903cd4c0119f01080b9314b80
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 36d1e75abd559af0c4ec769ee5dd353f9ed4ffb7)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -33,6 +33,7 @@
       <body-content>empty</body-content>
 
       <attribute>
+         <description>Output details from the shared session UserDTO object</description>
          <name>property</name>
          <required>true</required>
 
@@ -63,6 +64,7 @@
       <body-content>empty</body-content>
 
       <attribute>
+         <description>Output stylesheet based on the user preferences.</description>
          <name>localLink</name>
          <required>false</required>
 
@@ -272,5 +274,9 @@
        <name>SetEditor</name>
        <path>/WEB-INF/tags/SetEditor.tag</path>
    	</tag-file>
+   	<tag-file>
+       <name>AuthoringButton</name>
+       <path>/WEB-INF/tags/AuthoringButton.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r318b6abe8422efe8b6bac112c6dc0fd15ba13873 -r50d68fddcd33b33903cd4c0119f01080b9314b80
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 318b6abe8422efe8b6bac112c6dc0fd15ba13873)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
@@ -1,25 +1,23 @@
-<%@ include file="/common/taglibs.jsp" %>
-<%@ page import="java.util.HashSet" %>
-<%@ page import="java.util.Set" %>
-    <% 
-    	
-		Set tabs = new HashSet();
-		tabs.add("label.authoring.heading.basic");
-		tabs.add("label.authoring.heading.advance");
-		tabs.add("label.authoring.heading.instructions");
-		pageContext.setAttribute("tabs", tabs);
-		
-	%>
+<%@ include file="/common/taglibs.jsp"%>
+<%@ page import="java.util.HashSet"%>
+<%@ page import="java.util.Set"%>
+<%Set tabs = new HashSet();
+			tabs.add("label.authoring.heading.basic");
+			tabs.add("label.authoring.heading.advance");
+			tabs.add("label.authoring.heading.instructions");
+			pageContext.setAttribute("tabs", tabs);
+
+			%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
 <head>
-	<title><fmt:message key="label.author.title"/></title>
-	
-    <%@ include file="/common/header.jsp" %>
-    <%@ include file="/common/fckeditorheader.jsp" %>
+	<title><fmt:message key="label.author.title" /></title>
+
+	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/fckeditorheader.jsp"%>
+
+	<script>
     
-    <script>
-    
     	var imgRoot="${lams}images/";
 	    var themeName="aqua";
         
@@ -47,10 +45,7 @@
 	    	// end optional tab controller stuff
 	    	selectTab(tabId);
         } 
-        
-        function doSubmit() {
-        	$("authoringForm").submit();
-        }
+
         function doUploadOnline() {
         	var myForm = $("authoringForm");
         	myForm.action = "<c:url value='/authoring/uploadOnlineFile.do'/>";
@@ -64,58 +59,61 @@
         
         
     </script>
-    <!-- ******************** END FCK Editor related javascript & HTML ********************** -->
-    
-    
+	<!-- ******************** END FCK Editor related javascript & HTML ********************** -->
+
+
 </head>
 <body onLoad="init()">
 
-<html:form action="authoring/update" method="post" styleId="authoringForm"
-	focus="resource.title"  enctype="multipart/form-data">
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<html:hidden property="toolContentID"/>
+	<html:form action="authoring/update" method="post" styleId="authoringForm" focus="resource.title" enctype="multipart/form-data">
+		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+		<html:hidden property="toolContentID" />
 		<html:hidden property="currentTab" styleId="currentTab" />
 
-<h1><fmt:message key="label.authoring.heading" /></h1>
+		<h1>
+			<fmt:message key="label.authoring.heading" />
+		</h1>
 
-<!-- start tabs -->
-<lams:Tabs collection="${tabs}" useKey="true" control="true"/>
-<!-- end tab buttons -->
-<div class="tabbody">
-<table align=center> 	  
-				<tr>   
-				<td NOWRAP>
-						<%@ include file="/common/messages.jsp" %>
-				</td>
-				</tr> 
-</table>
+		<!-- start tabs -->
+		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
+		<!-- end tab buttons -->
+		<div class="tabbody">
+			<table align=center>
+				<tr>
+					<td NOWRAP>
+						<%@ include file="/common/messages.jsp"%>
+					</td>
+				</tr>
+			</table>
 
-<!-- tab content 1 (Basic) -->
-<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp"/>
-<!-- end of content (Basic) -->
-      
-<!-- tab content 2 (Advanced) -->
-<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
-<!-- end of content (Advanced) -->
+			<!-- tab content 1 (Basic) -->
+			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+			<!-- end of content (Basic) -->
 
-<!-- tab content 3 (Instructions) -->
-<lams:TabBody id="3" titleKey="label.authoring.heading.instructions.desc" page="instructions.jsp" />
-<!-- end of content (Instructions) -->
+			<!-- tab content 2 (Advanced) -->
+			<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+			<!-- end of content (Advanced) -->
 
+			<!-- tab content 3 (Instructions) -->
+			<lams:TabBody id="3" titleKey="label.authoring.heading.instructions.desc" page="instructions.jsp" />
+			<!-- end of content (Instructions) -->
 
-<!-- Button Row -->
-		<p align="right">
-			<html:link href="javascript:doSubmit();" property="submit" styleClass="button">
-				<fmt:message key="label.authoring.save.button" />
-			</html:link>
-			<html:link href="javascript:;" property="cancel" onclick="window.close()" styleClass="button">
-				<fmt:message key="label.authoring.cancel.button" />
-			</html:link>
-		</p>
-</div>
-<lams:HTMLEditor/>
-	
 
-</html:form>
+			<!-- Button Row -->
+			<%--  Default value 
+				<c:set var="cancelButtonLabelKey">label.authoring.cancel.button</c:set>
+				<c:set var="saveButtonLabelKey">label.authoring.save.button</c:set>
+				<c:set var="cancelConfirmMsgKey">authoring.msg.cancel.save</c:set>
+			--%>
+			<c:set var="toolSignature">
+				<fmt:message key="signature" />
+			</c:set>
+			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="${toolSignature}" toolContentID="${formBean.toolContentID}" />
+
+		</div>
+		<lams:HTMLEditor />
+
+
+	</html:form>
 </body>
 </html:html>