Index: lams_tool_spreadsheet/.classpath
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/.classpath	(.../.classpath)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/.classpath	(.../.classpath)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-5.0.10.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ViewItemAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/AuthoringController.java
===================================================================
diff -u
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/AuthoringController.java	(revision 0)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/AuthoringController.java	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -0,0 +1,188 @@
+/****************************************************************
+ * 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.spreadsheet.web.controller;
+
+import java.sql.Timestamp;
+import java.util.Date;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants;
+import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet;
+import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser;
+import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService;
+import org.lamsfoundation.lams.tool.spreadsheet.web.form.SpreadsheetForm;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ */
+@Controller
+@RequestMapping("/authoring")
+public class AuthoringController {
+
+    private static Logger log = Logger.getLogger(AuthoringController.class);
+
+    @Autowired
+    @Qualifier("spreadsheetService")
+    private ISpreadsheetService service;
+
+    /**
+     * Read spreadsheet data from database and put them into HttpSession. It will redirect to init.do directly after
+     * this method run successfully.
+     *
+     * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
+     */
+    @RequestMapping("/start")
+    public String start(@ModelAttribute SpreadsheetForm spreadsheetForm, HttpServletRequest request)
+	    throws ServletException {
+
+	// save toolContentID into HTTPSession
+	Long contentId = new Long(WebUtil.readLongParam(request, SpreadsheetConstants.PARAM_TOOL_CONTENT_ID));
+
+	Spreadsheet spreadsheet = null;
+
+	// Get contentFolderID and save to form.
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	spreadsheetForm.setContentFolderID(contentFolderID);
+
+	// initial Session Map
+	SessionMap<String, Object> sessionMap = new SessionMap<>();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+	spreadsheetForm.setSessionMapID(sessionMap.getSessionID());
+
+	try {
+	    spreadsheet = service.getSpreadsheetByContentId(contentId);
+	    // if spreadsheet does not exist, try to use default content instead.
+	    if (spreadsheet == null) {
+		spreadsheet = service.getDefaultContent(contentId);
+	    }
+	    spreadsheetForm.setSpreadsheet(spreadsheet);
+	} catch (Exception e) {
+	    log.error(e);
+	    throw new ServletException(e);
+	}
+
+	sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE_FORM, spreadsheetForm);
+	request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL,
+		request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL));
+	return "pages/authoring/start";
+    }
+
+    /**
+     * Display same entire authoring page content from HttpSession variable.
+     */
+    @RequestMapping("/init")
+    public String initPage(@ModelAttribute SpreadsheetForm spreadsheetForm, HttpServletRequest request)
+	    throws ServletException {
+
+	String sessionMapID = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	SpreadsheetForm existForm = (SpreadsheetForm) sessionMap.get(SpreadsheetConstants.ATTR_RESOURCE_FORM);
+
+	try {
+	    PropertyUtils.copyProperties(spreadsheetForm, existForm);
+	} catch (Exception e) {
+	    throw new ServletException(e);
+	}
+
+	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+
+	return "pages/authoring/authoring";
+    }
+
+    /**
+     * This method will persist all information in this authoring page, include all spreadsheet item, information etc.
+     */
+    @RequestMapping(path = "/updateContent", method = RequestMethod.POST)
+    public String updateContent(@ModelAttribute SpreadsheetForm spreadsheetForm, HttpServletRequest request)
+	    throws Exception {
+
+	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+
+	Spreadsheet spreadsheet = spreadsheetForm.getSpreadsheet();
+
+	// **********************************Get Spreadsheet PO*********************
+	Spreadsheet spreadsheetPO = service.getSpreadsheetByContentId(spreadsheetForm.getSpreadsheet().getContentId());
+	if (spreadsheetPO == null) {
+	    // new Spreadsheet, create it.
+	    spreadsheetPO = spreadsheet;
+	    spreadsheetPO.setCreated(new Timestamp(new Date().getTime()));
+	    spreadsheetPO.setUpdated(new Timestamp(new Date().getTime()));
+
+	} else {
+	    Long uid = spreadsheetPO.getUid();
+	    PropertyUtils.copyProperties(spreadsheetPO, spreadsheet);
+	    // get back UID
+	    spreadsheetPO.setUid(uid);
+
+	    // if it's a teacher - change define later status
+	    if (mode.isTeacher()) {
+		spreadsheetPO.setDefineLater(false);
+	    }
+
+	    spreadsheetPO.setUpdated(new Timestamp(new Date().getTime()));
+	}
+
+	// *******************************Handle user*******************
+	// try to get form system session
+	HttpSession ss = SessionManager.getSession();
+	// get back login user DTO
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	SpreadsheetUser spreadsheetUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue()),
+		spreadsheetForm.getSpreadsheet().getContentId());
+	if (spreadsheetUser == null) {
+	    spreadsheetUser = new SpreadsheetUser(user, spreadsheetPO);
+	}
+
+	spreadsheetPO.setCreatedBy(spreadsheetUser);
+
+	// finally persist spreadsheetPO again
+	service.saveOrUpdateSpreadsheet(spreadsheetPO);
+
+	spreadsheetForm.setSpreadsheet(spreadsheetPO);
+
+	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	return "pages/authoring/authoring";
+    }
+
+}
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/ClearSessionController.java
===================================================================
diff -u
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/ClearSessionController.java	(revision 0)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/ClearSessionController.java	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -0,0 +1,69 @@
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.spreadsheet.web.controller;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
+import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishController;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.context.WebApplicationContext;
+
+/**
+ * This class give a chance to clear HttpSession when user save/close authoring page.
+ *
+ * @author Steve.Ni
+ *
+ * @version $Revision$
+ */
+@Controller
+public class ClearSessionController extends LamsAuthoringFinishController {
+    private static Logger logger = Logger.getLogger(ClearSessionController.class.getName());
+
+    @Autowired
+    private WebApplicationContext applicationContext;
+
+    @RequestMapping("/clearsession")
+    public void execute(HttpServletRequest request, HttpServletResponse response) throws IOException {
+	super.execute(request, response, applicationContext);
+    }
+
+    @Override
+    public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode) {
+	session.removeAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG);
+	if (mode.isAuthor()) {
+	    ClearSessionController.logger.debug("In Author mode");
+	    session.removeAttribute(customiseSessionID);
+	}
+    }
+
+}
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/LearningController.java
===================================================================
diff -u
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/LearningController.java	(revision 0)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/LearningController.java	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -0,0 +1,350 @@
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.spreadsheet.web.controller;
+
+import java.util.Date;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants;
+import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet;
+import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetSession;
+import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser;
+import org.lamsfoundation.lams.tool.spreadsheet.model.UserModifiedSpreadsheet;
+import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService;
+import org.lamsfoundation.lams.tool.spreadsheet.service.SpreadsheetApplicationException;
+import org.lamsfoundation.lams.tool.spreadsheet.web.form.ReflectionForm;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.util.HtmlUtils;
+
+/**
+ *
+ * @author Andrey Balan
+ */
+@Controller
+@RequestMapping("/learning")
+public class LearningController {
+
+    private static Logger log = Logger.getLogger(LearningController.class);
+
+    @Autowired
+    @Qualifier("spreadsheetService")
+    private ISpreadsheetService service;
+
+    @Autowired
+    private WebApplicationContext applicationContext;
+
+    /**
+     * Read spreadsheet data from database and put them into HttpSession. It will redirect to init.do directly after
+     * this method run successfully.
+     *
+     * This method will avoid read database again and lost un-saved resouce item lost when user "refresh page",
+     */
+    @RequestMapping("/start")
+    public String start(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request) {
+
+	//initial Session Map
+	SessionMap<String, Object> sessionMap = new SessionMap<>();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+
+	//save toolContentID into HTTPSession
+	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
+
+	Long sessionId = new Long(request.getParameter(SpreadsheetConstants.PARAM_TOOL_SESSION_ID));
+
+	request.setAttribute(SpreadsheetConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	request.setAttribute(AttributeNames.ATTR_MODE, mode);
+	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+
+	//get back the spreadsheet and item list and display them on page
+	SpreadsheetUser spreadsheetUser = null;
+	if (mode != null && mode.isTeacher()) {
+	    // monitoring mode - user is specified in URL
+	    // spreadsheetUser may be null if the user was force completed.
+	    spreadsheetUser = getSpecifiedUser(service, sessionId,
+		    WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, false));
+	} else {
+	    spreadsheetUser = getCurrentUser(service, sessionId);
+	}
+
+	Spreadsheet spreadsheet;
+	spreadsheet = service.getSpreadsheetBySessionId(sessionId);
+
+	//check whehter finish lock is on/off
+	boolean lock = spreadsheet.getLockWhenFinished() && spreadsheetUser != null
+		&& spreadsheetUser.isSessionFinished();
+
+	// get notebook entry
+	String entryText = new String();
+	if (spreadsheetUser != null) {
+	    NotebookEntry notebookEntry = service.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		    SpreadsheetConstants.TOOL_SIGNATURE, spreadsheetUser.getUserId().intValue());
+	    if (notebookEntry != null) {
+		entryText = notebookEntry.getEntry();
+	    }
+	}
+
+	//basic information
+	sessionMap.put(SpreadsheetConstants.ATTR_TITLE, spreadsheet.getTitle());
+	sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE_INSTRUCTION, spreadsheet.getInstructions());
+	sessionMap.put(SpreadsheetConstants.ATTR_FINISH_LOCK, lock);
+	sessionMap.put(SpreadsheetConstants.ATTR_LOCK_ON_FINISH, spreadsheet.getLockWhenFinished());
+	sessionMap.put(SpreadsheetConstants.ATTR_USER_FINISHED,
+		spreadsheetUser != null && spreadsheetUser.isSessionFinished());
+
+	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+	sessionMap.put(AttributeNames.ATTR_MODE, mode);
+	//reflection information
+	sessionMap.put(SpreadsheetConstants.ATTR_REFLECTION_ON, spreadsheet.isReflectOnActivity());
+	sessionMap.put(SpreadsheetConstants.ATTR_REFLECTION_INSTRUCTION, spreadsheet.getReflectInstructions());
+	sessionMap.put(SpreadsheetConstants.ATTR_REFLECTION_ENTRY, entryText);
+
+	//add define later support
+	if (spreadsheet.isDefineLater()) {
+	    return "pages/learning/definelater";
+	}
+
+	//set contentInUse flag to true
+	if (!spreadsheet.isContentInUse()) {
+	    spreadsheet.setContentInUse(true);
+	    service.saveOrUpdateSpreadsheet(spreadsheet);
+	}
+
+	String code;
+	if (spreadsheet.isLearnerAllowedToSave() && (spreadsheetUser.getUserModifiedSpreadsheet() != null)) {
+	    code = spreadsheetUser.getUserModifiedSpreadsheet().getUserModifiedSpreadsheet();
+	} else {
+	    code = spreadsheet.getCode();
+	}
+	sessionMap.put(SpreadsheetConstants.ATTR_CODE, HtmlUtils.htmlEscape(code));
+	sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE, spreadsheet);
+
+	if ((spreadsheetUser != null) && (spreadsheetUser.getUserModifiedSpreadsheet() != null)
+		&& (spreadsheetUser.getUserModifiedSpreadsheet().getMark() != null)) {
+	    request.setAttribute(SpreadsheetConstants.ATTR_USER_IS_MARKED, true);
+	    if ((spreadsheetUser.getUserModifiedSpreadsheet().getMark().getDateMarksReleased() != null)) {
+		request.setAttribute(SpreadsheetConstants.ATTR_USER_MARK,
+			spreadsheetUser.getUserModifiedSpreadsheet().getMark());
+	    }
+	} else {
+	    request.setAttribute(SpreadsheetConstants.ATTR_USER_IS_MARKED, false);
+	}
+
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
+		request, applicationContext.getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+
+	return "pages/learning/learning";
+    }
+
+    /**
+     * Finish learning session.
+     */
+    @RequestMapping("/saveUserSpreadsheet")
+    public String saveUserSpreadsheet(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request) {
+
+	//get back SessionMap
+	String sessionMapID = request.getParameter(SpreadsheetConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+
+	//get mode and ToolSessionID from sessionMAP
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	boolean userFinished = (Boolean) sessionMap.get(SpreadsheetConstants.ATTR_USER_FINISHED);
+
+	//save learner changes in spreadsheet if such option is activated in spreadsheet
+	Spreadsheet spreadsheet = (Spreadsheet) sessionMap.get(SpreadsheetConstants.ATTR_RESOURCE);
+	Spreadsheet spreadsheetPO = service.getSpreadsheetByContentId(spreadsheet.getContentId());
+	if (spreadsheetPO.isLearnerAllowedToSave() && !mode.isTeacher()
+		&& !(spreadsheet.getLockWhenFinished() && userFinished)) {
+
+	    SpreadsheetUser spreadsheetUser = getCurrentUser(service, sessionId);
+	    UserModifiedSpreadsheet userModifiedSpreadsheet = spreadsheetUser.getUserModifiedSpreadsheet();
+
+	    if (spreadsheetUser.getUserModifiedSpreadsheet() == null
+		    || spreadsheetUser.getUserModifiedSpreadsheet().getMark() == null) {
+		if (userModifiedSpreadsheet == null) {
+		    userModifiedSpreadsheet = new UserModifiedSpreadsheet();
+		}
+		String code = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_CODE);
+		userModifiedSpreadsheet.setUserModifiedSpreadsheet(code);
+		spreadsheetUser.setUserModifiedSpreadsheet(userModifiedSpreadsheet);
+		service.saveOrUpdateUser(spreadsheetUser);
+	    }
+	}
+
+	String typeOfAction = WebUtil.readStrParam(request, "typeOfAction");
+	String conf;
+	if ("finishSession".equals(typeOfAction)) {
+	    conf = "finishSession.do";
+	} else if ("continueReflect".equals(typeOfAction)) {
+	    conf = "newReflection.do";
+	} else {
+	    conf = "start.do";
+	}
+
+	String redirect = "redirect:/learning/" + conf;
+	redirect = WebUtil.appendParameterToURL(redirect, SpreadsheetConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	redirect = WebUtil.appendParameterToURL(redirect, AttributeNames.PARAM_TOOL_SESSION_ID, sessionId.toString());
+	redirect = WebUtil.appendParameterToURL(redirect, AttributeNames.ATTR_MODE, mode.toString());
+	return redirect;
+    }
+
+    /**
+     * Finish learning session.
+     */
+    @RequestMapping("/finish")
+    public String finish(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request) {
+
+	//get back SessionMap
+	String sessionMapID = request.getParameter(SpreadsheetConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+
+	//get mode and ToolSessionID from sessionMAP
+	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	// get sessionId from HttpServletRequest
+	String nextActivityUrl = null;
+	try {
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    Long userID = new Long(userDTO.getUserID().longValue());
+
+	    nextActivityUrl = service.finishToolSession(sessionId, userID);
+	    request.setAttribute(SpreadsheetConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl);
+	} catch (SpreadsheetApplicationException e) {
+	    log.error("Failed get next activity url:" + e.getMessage());
+	}
+
+	return "pages/learning/finish";
+    }
+
+    /**
+     * Display empty reflection form.
+     */
+    @RequestMapping("/newReflection")
+    public String newReflection(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request) {
+
+	//get session value
+	String sessionMapID = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_SESSION_MAP_ID);
+
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
+	reflectionForm.setUserID(user.getUserID());
+	reflectionForm.setSessionMapID(sessionMapID);
+
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	Long toolSessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	NotebookEntry entry = service.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
+		SpreadsheetConstants.TOOL_SIGNATURE, user.getUserID());
+
+	if (entry != null) {
+	    reflectionForm.setEntryText(entry.getEntry());
+	}
+
+	return "pages/learning/notebook";
+    }
+
+    /**
+     * Submit reflection form input database.
+     */
+    @RequestMapping(path = "/submitReflection", method = RequestMethod.POST)
+    public String submitReflection(@ModelAttribute ReflectionForm reflectionForm, HttpServletRequest request) {
+
+	Integer userId = reflectionForm.getUserID();
+
+	String sessionMapID = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	// check for existing notebook entry
+	NotebookEntry entry = service.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		SpreadsheetConstants.TOOL_SIGNATURE, userId);
+
+	if (entry == null) {
+	    // create new entry
+	    service.createNotebookEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		    SpreadsheetConstants.TOOL_SIGNATURE, userId, reflectionForm.getEntryText());
+	} else {
+	    // update existing entry
+	    entry.setEntry(reflectionForm.getEntryText());
+	    entry.setLastModified(new Date());
+	    service.updateEntry(entry);
+	}
+
+	return finish(reflectionForm, request);
+    }
+
+    //*************************************************************************************
+    // Private methods
+    //*************************************************************************************
+
+    private SpreadsheetUser getCurrentUser(ISpreadsheetService service, Long sessionId) {
+	//try to get form system session
+	HttpSession ss = SessionManager.getSession();
+	//get back login user DTO
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	SpreadsheetUser spreadsheetUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()),
+		sessionId);
+
+	if (spreadsheetUser == null) {
+	    SpreadsheetSession session = service.getSessionBySessionId(sessionId);
+	    spreadsheetUser = new SpreadsheetUser(user, session);
+	    service.saveOrUpdateUser(spreadsheetUser);
+	}
+	return spreadsheetUser;
+    }
+
+    private SpreadsheetUser getSpecifiedUser(ISpreadsheetService service, Long sessionId, Integer userId) {
+	SpreadsheetUser spreadsheetUser = service.getUserByIDAndSession(new Long(userId.intValue()), sessionId);
+	if (spreadsheetUser == null) {
+	    log.error("Unable to find specified user for spreadsheet activity. Screens are likely to fail. SessionId="
+		    + sessionId + " UserId=" + userId);
+	}
+	return spreadsheetUser;
+    }
+}
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/MonitoringController.java
===================================================================
diff -u
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/MonitoringController.java	(revision 0)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/MonitoringController.java	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -0,0 +1,425 @@
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.spreadsheet.web.controller;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants;
+import org.lamsfoundation.lams.tool.spreadsheet.dto.StatisticDTO;
+import org.lamsfoundation.lams.tool.spreadsheet.dto.Summary;
+import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet;
+import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetMark;
+import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetSession;
+import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser;
+import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService;
+import org.lamsfoundation.lams.tool.spreadsheet.web.form.MarkForm;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.NumberUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.util.HtmlUtils;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+@Controller
+@RequestMapping("/monitoring")
+public class MonitoringController {
+
+    public static Logger log = Logger.getLogger(MonitoringController.class);
+
+    @Autowired
+    @Qualifier("spreadsheetService")
+    private ISpreadsheetService service;
+
+    @Autowired
+    @Qualifier("spreadsheetMessageService")
+    private MessageService messageService;
+
+    @RequestMapping("/summary")
+    public String summary(HttpServletRequest request, HttpServletResponse response) {
+	//initial Session Map
+	SessionMap sessionMap = new SessionMap();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+	request.setAttribute(SpreadsheetConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+
+	Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	List<Summary> summaryList = service.getSummary(contentId);
+
+	List<StatisticDTO> statisticList = service.getStatistics(contentId);
+	request.setAttribute(SpreadsheetConstants.ATTR_STATISTIC_LIST, statisticList);
+
+	Spreadsheet spreadsheet = service.getSpreadsheetByContentId(contentId);
+
+	//cache into sessionMap
+	sessionMap.put(SpreadsheetConstants.ATTR_SUMMARY_LIST, summaryList);
+	sessionMap.put(SpreadsheetConstants.PAGE_EDITABLE, spreadsheet.isContentInUse());
+	sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE, spreadsheet);
+	sessionMap.put(SpreadsheetConstants.ATTR_TOOL_CONTENT_ID, contentId);
+	sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID,
+		WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID));
+	sessionMap.put(SpreadsheetConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId));
+
+	return "pages/monitoring/monitoring";
+    }
+
+    @RequestMapping(path = "/getUsers", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ResponseBody
+    public String getUsers(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+	Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
+	Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+
+	// paging parameters of tablesorter
+	int size = WebUtil.readIntParam(request, "size");
+	int page = WebUtil.readIntParam(request, "page");
+	Integer sortByName = WebUtil.readIntParam(request, "column[0]", true);
+	Integer sortByMarked = WebUtil.readIntParam(request, "column[1]", true);
+	String searchString = request.getParameter("fcol[0]");
+
+	int sorting = SpreadsheetConstants.SORT_BY_NO;
+	if (sortByName != null) {
+	    sorting = sortByName.equals(0) ? SpreadsheetConstants.SORT_BY_USERNAME_ASC
+		    : SpreadsheetConstants.SORT_BY_USERNAME_DESC;
+	} else if (sortByMarked != null) {
+	    sorting = sortByMarked.equals(0) ? SpreadsheetConstants.SORT_BY_MARKED_ASC
+		    : SpreadsheetConstants.SORT_BY_MARKED_DESC;
+	}
+
+	//return user list according to the given sessionID
+	Spreadsheet spreadsheet = service.getSpreadsheetByContentId(contentId);
+	List<Object[]> users = service.getUsersForTablesorter(sessionID, page, size, sorting, searchString,
+		spreadsheet.isReflectOnActivity());
+
+	ArrayNode rows = JsonNodeFactory.instance.arrayNode();
+	ObjectNode responsedata = JsonNodeFactory.instance.objectNode();
+	responsedata.put("total_rows", service.getCountUsersBySession(sessionID, searchString));
+
+	for (Object[] userAndReflection : users) {
+
+	    ObjectNode responseRow = JsonNodeFactory.instance.objectNode();
+
+	    SpreadsheetUser user = (SpreadsheetUser) userAndReflection[0];
+	    responseRow.put(SpreadsheetConstants.ATTR_USER_UID, user.getUid());
+	    responseRow.put(SpreadsheetConstants.ATTR_USER_ID, user.getUserId());
+	    responseRow.put(SpreadsheetConstants.ATTR_USER_NAME, HtmlUtils.htmlEscape(user.getFullUsername()));
+	    if (user.getUserModifiedSpreadsheet() != null) {
+		responseRow.put("userModifiedSpreadsheet", "true");
+		if (user.getUserModifiedSpreadsheet().getMark() != null) {
+		    responseRow.put("mark",
+			    NumberUtil.formatLocalisedNumber(user.getUserModifiedSpreadsheet().getMark().getMarks(),
+				    request.getLocale(), SpreadsheetConstants.MARK_NUM_DEC_PLACES));
+		}
+	    }
+
+	    if (userAndReflection.length > 1 && userAndReflection[1] != null) {
+		responseRow.put("reflection", HtmlUtils.htmlEscape((String) userAndReflection[1]));
+	    }
+
+	    rows.add(responseRow);
+	}
+	responsedata.set("rows", rows);
+
+	return responsedata.toString();
+    }
+
+    /**
+     * AJAX call to refresh statistic page.
+     */
+    @RequestMapping("/doStatistic")
+    public String doStatistic(HttpServletRequest request) {
+	Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+
+	List<StatisticDTO> statisticList = service.getStatistics(contentId);
+	request.setAttribute(SpreadsheetConstants.ATTR_STATISTIC_LIST, statisticList);
+	request.setAttribute(SpreadsheetConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId));
+
+	return "pages/monitoring/parts/statisticspart";
+    }
+
+    /**
+     * View mark of all learner from same tool content ID.
+     */
+    @RequestMapping("/viewAllMarks")
+    public String viewAllMarks(HttpServletRequest request) {
+
+	Long sessionId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
+
+	//return FileDetailsDTO list according to the given sessionID
+	List<SpreadsheetUser> userList = service.getUserListBySessionId(sessionId);
+	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+	request.setAttribute(SpreadsheetConstants.ATTR_USER_LIST, userList);
+	request.setAttribute(SpreadsheetConstants.ATTR_SESSION_MAP_ID,
+		WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_SESSION_MAP_ID));
+
+	return "pages/monitoring/parts/viewallmarks";
+    }
+
+    /**
+     * Release mark
+     */
+    @RequestMapping("/releaseMarks")
+    @ResponseBody
+    public String releaseMarks(HttpServletRequest request, HttpServletResponse response) {
+
+	//get service then update report table
+	Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
+
+	service.releaseMarksForSession(sessionID);
+	try {
+	    response.setContentType("text/html;charset=utf-8");
+	    PrintWriter out = response.getWriter();
+	    SpreadsheetSession session = service.getSessionBySessionId(sessionID);
+	    String sessionName = "";
+	    if (session != null) {
+		sessionName = session.getSessionName();
+	    }
+	    out.write(messageService.getMessage("msg.mark.released", new String[] { sessionName }));
+	    out.flush();
+	} catch (IOException e) {
+	}
+
+	return null;
+    }
+
+    /**
+     * Download Spreadsheet marks by MS Excel file format.
+     */
+    @RequestMapping("/downloadMarks")
+    public String downloadMarks(HttpServletRequest request, HttpServletResponse response) {
+
+	Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
+	//return user list according to the given sessionID
+	List<SpreadsheetUser> userList = service.getUserListBySessionId(sessionID);
+
+	//construct Excel file format and download
+	String errors = null;
+	try {
+	    //create an empty excel file
+	    HSSFWorkbook wb = new HSSFWorkbook();
+	    HSSFSheet sheet = wb.createSheet("Marks");
+	    sheet.setColumnWidth(0, 5000);
+	    sheet.setColumnWidth(2, 8000);
+	    HSSFRow row;
+	    HSSFCell cell;
+
+	    int idx = 0;
+
+	    row = sheet.createRow(idx++);
+	    cell = row.createCell(0);
+	    cell.setCellValue(messageService.getMessage("label.monitoring.downloadmarks.learner.name"));
+
+	    cell = row.createCell(1);
+	    cell.setCellValue(messageService.getMessage("label.monitoring.downloadmarks.marks"));
+
+	    cell = row.createCell(2);
+	    cell.setCellValue(messageService.getMessage("label.monitoring.downloadmarks.comments"));
+
+	    for (SpreadsheetUser user : userList) {
+		if (user.getUserModifiedSpreadsheet() != null && user.getUserModifiedSpreadsheet().getMark() != null) {
+		    SpreadsheetMark mark = user.getUserModifiedSpreadsheet().getMark();
+		    row = sheet.createRow(idx++);
+
+		    int count = 0;
+
+		    cell = row.createCell(count++);
+		    cell.setCellValue(user.getLoginName());
+
+		    //sheet.setColumnWidth(count,8000);
+
+		    cell = row.createCell(count++);
+		    if (mark.getMarks() != null) {
+			cell.setCellValue(NumberUtil.formatLocalisedNumber(mark.getMarks(), request.getLocale(),
+				SpreadsheetConstants.MARK_NUM_DEC_PLACES));
+		    } else {
+			cell.setCellValue("");
+		    }
+
+		    cell = row.createCell(count++);
+		    cell.setCellValue(mark.getComments());
+		}
+	    }
+
+	    ByteArrayOutputStream bos = new ByteArrayOutputStream();
+	    wb.write(bos);
+
+	    //construct download file response header
+	    String fileName = "marks" + sessionID + ".xls";
+	    String mineType = "application/vnd.ms-excel";
+	    String header = "attachment; filename=\"" + fileName + "\";";
+	    response.setContentType(mineType);
+	    response.setHeader("Content-Disposition", header);
+
+	    byte[] data = bos.toByteArray();
+	    response.getOutputStream().write(data, 0, data.length);
+	    response.getOutputStream().flush();
+	} catch (Exception e) {
+	    MonitoringController.log.error(e);
+	    errors = "monitoring.download.error";
+	}
+
+	if (errors != null) {
+	    try {
+		PrintWriter out = response.getWriter();
+		out.write(errors);
+		out.flush();
+	    } catch (IOException e) {
+	    }
+	}
+
+	return null;
+    }
+
+    @RequestMapping("/editMark")
+    public String editMark(@ModelAttribute MarkForm markForm, HttpServletRequest request,
+	    HttpServletResponse response) {
+	String sessionMapID = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_SESSION_MAP_ID);
+	Long userUid = WebUtil.readLongParam(request, SpreadsheetConstants.ATTR_USER_UID);
+	SpreadsheetUser user = service.getUser(userUid);
+
+	//		if((user == null) || (user.getUserModifiedSpreadsheet() == null)){
+	//			ActionErrors errors = new ActionErrors();
+	//			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SpreadsheetConstants.ERROR_MSG_MARKS_BLANK));
+	//			this.addErrors(request,errors);
+	//			return mapping.findForward("error");
+	//		}
+
+	markForm.setSessionMapID(sessionMapID);
+	markForm.setUserUid(user.getUid());
+	markForm.setUserName(user.getFullUsername());
+
+	String code = null;
+	if (user.getUserModifiedSpreadsheet() != null) {
+	    markForm.setCode(user.getUserModifiedSpreadsheet().getUserModifiedSpreadsheet());
+
+	    if (user.getUserModifiedSpreadsheet().getMark() != null) {
+		SpreadsheetMark mark = user.getUserModifiedSpreadsheet().getMark();
+		markForm.setMarks(NumberUtil.formatLocalisedNumber(mark.getMarks(), request.getLocale(),
+			SpreadsheetConstants.MARK_NUM_DEC_PLACES));
+		markForm.setComments(mark.getComments());
+	    }
+
+	}
+	request.setAttribute(SpreadsheetConstants.ATTR_CODE, code);
+
+	return "pages/monitoring/parts/editmark";
+    }
+
+    @RequestMapping(path = "/saveMark", method = RequestMethod.POST)
+    public String saveMark(@ModelAttribute MarkForm markForm, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	Float markFloat = null;
+	String markComment = null;
+
+	// get the mark details, validating as we go.
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	String markStr = markForm.getMarks();
+	if (StringUtils.isBlank(markStr)) {
+	    errorMap.add("GLOBAL", messageService.getMessage("error.summary.marks.blank"));
+	} else {
+	    try {
+		markFloat = NumberUtil.getLocalisedFloat(markStr, request.getLocale());
+	    } catch (Exception e) {
+		errorMap.add("GLOBAL", messageService.getMessage("error.summary.marks.invalid.number"));
+	    }
+	}
+
+	markComment = markForm.getComments();
+	if (StringUtils.isBlank(markComment)) {
+	    errorMap.add("GLOBAL", messageService.getMessage("error.summary.comments.blank"));
+	}
+
+	if (!errorMap.isEmpty()) {
+	    request.setAttribute("errorMap", errorMap);
+	    return "pages/monitoring/parts/editmark";
+	}
+
+	// passed validation so proceed to save
+	Long userUid = markForm.getUserUid();
+	SpreadsheetUser user = service.getUser(userUid);
+	if (user != null && user.getUserModifiedSpreadsheet() != null) {
+	    //check whether it is "edit(old item)" or "add(new item)"
+	    SpreadsheetMark mark;
+	    if (user.getUserModifiedSpreadsheet().getMark() == null) { //new mark
+		mark = new SpreadsheetMark();
+		user.getUserModifiedSpreadsheet().setMark(mark);
+	    } else { //edit
+		mark = user.getUserModifiedSpreadsheet().getMark();
+	    }
+
+	    mark.setMarks(markFloat);
+	    mark.setComments(markComment);
+
+	    service.saveOrUpdateUserModifiedSpreadsheet(user.getUserModifiedSpreadsheet());
+	}
+
+	request.setAttribute("mark", NumberUtil.formatLocalisedNumber(markFloat, request.getLocale(),
+		SpreadsheetConstants.MARK_NUM_DEC_PLACES)); // reduce it to the standard number of decimal places for redisplay
+	request.setAttribute("userUid", userUid);
+
+	//set session map ID so that itemlist.jsp can get sessionMAP
+	request.setAttribute(SpreadsheetConstants.ATTR_SESSION_MAP_ID, markForm.getSessionMapID());
+
+	return "pages/monitoring/parts/updatemarkaftersave";
+    }
+
+    // *************************************************************************************
+    // Private method
+    // *************************************************************************************
+
+    /**
+     * Save statistic information into request
+     */
+    private void statistic(HttpServletRequest request, List submitFilesSessionList) {
+	Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	List<StatisticDTO> statisticList = service.getStatistics(contentId);
+
+    }
+
+}
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/ViewItemController.java
===================================================================
diff -u
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/ViewItemController.java	(revision 0)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/ViewItemController.java	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -0,0 +1,65 @@
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.tool.spreadsheet.web.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants;
+import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser;
+import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+public class ViewItemController {
+
+    private static final Logger log = Logger.getLogger(ViewItemController.class);
+
+    @Autowired
+    @Qualifier("spreadsheetService")
+    private ISpreadsheetService service;
+
+    /**
+     * Display main frame to display instrcution and item content.
+     */
+    @RequestMapping("/reviewItem")
+    public String reviewItem(HttpServletRequest request) {
+
+	Long userId = WebUtil.readLongParam(request, SpreadsheetConstants.ATTR_USER_UID);
+	SpreadsheetUser user = service.getUser(userId);
+	request.setAttribute(SpreadsheetConstants.ATTR_USER_NAME, user.getFullUsername());
+	String code = null;
+	if (user.getUserModifiedSpreadsheet() != null) {
+	    code = user.getUserModifiedSpreadsheet().getUserModifiedSpreadsheet();
+	}
+	request.setAttribute("code", code);
+
+	return "pages/reviewitem/reviewitem";
+    }
+
+}
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/MarkForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/MarkForm.java	(.../MarkForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/MarkForm.java	(.../MarkForm.java)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -20,18 +20,15 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.spreadsheet.web.form;
 
-import org.apache.struts.action.ActionForm;
-
 /**
  * Mark Form.
  *
  *
  * User: Andrey Balan
  */
-public class MarkForm extends ActionForm {
+public class MarkForm {
 
     private static final long serialVersionUID = -6028705988278223361L;
 
@@ -76,19 +73,19 @@
     }
 
     public String getCode() {
-        return code;
+	return code;
     }
 
     public void setCode(String code) {
-        this.code = code;
+	this.code = code;
     }
 
     public String getUserName() {
-        return userName;
+	return userName;
     }
 
     public void setUserName(String userName) {
-        this.userName = userName;
+	this.userName = userName;
     }
 
 }
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/ReflectionForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/ReflectionForm.java	(.../ReflectionForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/ReflectionForm.java	(.../ReflectionForm.java)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -21,19 +21,17 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.spreadsheet.web.form;
 
 import org.apache.log4j.Logger;
-import org.apache.struts.validator.ValidatorForm;
 
 /**
  *
  * Reflection Form.
  *
  *
  */
-public class ReflectionForm extends ValidatorForm {
+public class ReflectionForm {
     private static final long serialVersionUID = -9054365604649146735L;
     private static Logger logger = Logger.getLogger(ReflectionForm.class.getName());
 
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/SpreadsheetForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/SpreadsheetForm.java	(.../SpreadsheetForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/SpreadsheetForm.java	(.../SpreadsheetForm.java)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -27,10 +27,8 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  *
@@ -39,7 +37,7 @@
  *
  * User: Andrey Balan
  */
-public class SpreadsheetForm extends ActionForm {
+public class SpreadsheetForm {
     private static final long serialVersionUID = 3599879328307492312L;
 
     private static Logger logger = Logger.getLogger(SpreadsheetForm.class.getName());
@@ -48,8 +46,8 @@
     private String sessionMapID;
     private String contentFolderID;
     private int currentTab;
-    private FormFile offlineFile;
-    private FormFile onlineFile;
+    private MultipartFile offlineFile;
+    private MultipartFile onlineFile;
 
     private Spreadsheet spreadsheet;
 
@@ -67,12 +65,11 @@
 	}
     }
 
-    @Override
-    public void reset(ActionMapping mapping, HttpServletRequest request) {
-	String param = mapping.getParameter();
+    public void reset(HttpServletRequest request) {
+	String param = (String) request.getAttribute("action");
 	//if it is start page, all data read out from database or current session
 	//so need not reset checkbox to refresh value!
-	if (!StringUtils.equals(param, "start") && !StringUtils.equals(param, "initPage")) {
+	if (!StringUtils.equals(param, "start.do") && !StringUtils.equals(param, "initPage.do")) {
 	    spreadsheet.setLockWhenFinished(false);
 	    spreadsheet.setDefineLater(false);
 	    spreadsheet.setLearnerAllowedToSave(true);
@@ -89,19 +86,19 @@
 	this.currentTab = currentTab;
     }
 
-    public FormFile getOfflineFile() {
+    public MultipartFile getOfflineFile() {
 	return offlineFile;
     }
 
-    public void setOfflineFile(FormFile offlineFile) {
+    public void setOfflineFile(MultipartFile offlineFile) {
 	this.offlineFile = offlineFile;
     }
 
-    public FormFile getOnlineFile() {
+    public MultipartFile getOnlineFile() {
 	return onlineFile;
     }
 
-    public void setOnlineFile(FormFile onlineFile) {
+    public void setOnlineFile(MultipartFile onlineFile) {
 	this.onlineFile = onlineFile;
     }
 
Index: lams_tool_spreadsheet/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/spring-servlet.xml	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/spring-servlet.xml	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+           				   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.tool.spreadsheet.web.controller" />
+	
+	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="prefix" value="/" />
+		<property name="suffix" value=".jsp" />
+	</bean>
+</beans>
\ No newline at end of file
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -32,7 +32,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -123,11 +122,11 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<html:link href="javascript:doSubmit_Form_Only();" styleId="saveButton" property="submit" styleClass="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+		</a>
+		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
+		</a>
 </div>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
@@ -284,42 +284,38 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
-							<fmt:message key="${noMinimumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" multiple="multiple" onmouseup="validateRatingLimits(true);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0"><fmt:message key='${noMinimumLabel}' /></form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2" label="2"/>
+						<form:option value="3" label="3"/>
+						<form:option value="4" label="4"/>
+						<form:option value="5" label="5"/>
+						<form:option value="6" label="6"/>
+						<form:option value="7" label="7"/>
+						<form:option value="8" label="8"/>
+						<form:option value="9" label="9"/>
+						<form:option value="10" label="10"/>
+					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
-							<fmt:message key="${noMaximumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" multiple="multiple" onmouseup="validateRatingLimits(false);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0"><fmt:message key='${noMaximumLabel}' /></form:option>
+						<form:option value="1" label="1"/>
+						<form:option value="2" label="2"/>
+						<form:option value="3" label="3"/>
+						<form:option value="4" label="4"/>
+						<form:option value="5" label="5"/>
+						<form:option value="6" label="6"/>
+						<form:option value="7" label="7"/>
+						<form:option value="8" label="8"/>
+						<form:option value="9" label="9"/>
+						<form:option value="10" label="10"/>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_tool_spreadsheet/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -42,23 +42,21 @@
 
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowCommentsVariableName}" value="1"
-		styleId="${allowCommentsVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowCommentsVariableName}" value="1"
+		id="${allowCommentsVariableName}"/>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
 
 <div id="likedislike">
 <div class="loffset20">
-		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
-		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowAnonymousVariableName}" 
+		id="${allowAnonymousVariableName}"/>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -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>
@@ -434,4 +435,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
+</c:choose>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -34,7 +34,6 @@
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <c:set var="class" value=""/>
 <c:if test="${id == 1}">
Index: lams_tool_spreadsheet/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -30,7 +30,6 @@
 
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <div class="panel-body panel-monitor-body">
 	 <jsp:doBody />
Index: lams_tool_spreadsheet/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -32,12 +32,11 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <%-- Required attributes --%>
 <%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
-<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
 
 <%-- Optional attributes --%>
 <%@ attribute name="action" required="false" rtexprvalue="true" %>
@@ -53,10 +52,10 @@
 
 <%-- Default value for message key --%>
 <c:if test="${empty action}">
-	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+	<c:set var="action" value="textsearch.do" scope="request"/>
 </c:if>
 <c:if test="${empty cancelAction}">
-	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+	<c:set var="cancelAction" value="textsearchCancel.do" scope="request"/>
 </c:if>
 <c:if test="${empty formID}">
 	<c:set var="formID" value="textSearchForm" scope="request"/>
@@ -85,52 +84,40 @@
 
 <!-- begin text search form content -->
 	
-<c:if test="${wrapInFormTag}">
-	<form action="${action}" id="${formID}" name="${formID}">
-</c:if>
-		<html:hidden property="sessionMapID" />
-		<h4><fmt:message key="${headingLabelKey}" /></h4>
-		<table>
-			<tr>
-				<td>
-					<fmt:message key="${allWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="allWords" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${phraseLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="phrase" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${anyWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="anyWords" /> 
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${excludedWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="excludedWords" /> 
-				</td>
-			</tr>
-		</table>
-<c:if test="${wrapInFormTag}">
-	<lams:ImgButtonWrapper>
-		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
-		</a>
-		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
-		</a>
-	</lams:ImgButtonWrapper>
-	</form>
-</c:if>
+	<form:hidden path="sessionMapID" />
+	<h4><fmt:message key="${headingLabelKey}" /></h4>
+	<table>
+		<tr>
+			<td>
+				<fmt:message key="${allWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="allWords" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${phraseLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="phrase" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${anyWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="anyWords" /> 
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${excludedWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="excludedWords" /> 
+			</td>
+		</tr>
+	</table>
 <!-- end text search form content -->
\ No newline at end of file
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tlds/struts/struts-bean-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tlds/struts/struts-html-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tlds/struts/struts-logic-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tlds/struts/struts-tiles-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 977c1d91def623ad1c8d5adffb4b32c810ef1dc6 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/validation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/web/WEB-INF/web.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -74,27 +74,14 @@
 
 
 	<servlet>
-		<servlet-name>action</servlet-name>
-		<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-		<init-param>
-			<param-name>config</param-name>
-			<param-value>/WEB-INF/struts-config.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>999</param-value>
-		</init-param>
-		<init-param>
-			<param-name>detail</param-name>
-			<param-value>1</param-value>
-		</init-param>
-		<init-param>
-			<param-name>validate</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<load-on-startup>2</load-on-startup>
+		<servlet-name>spring</servlet-name>
+		<servlet-class>
+			org.springframework.web.servlet.DispatcherServlet
+		</servlet-class>
+		<load-on-startup>1</load-on-startup>
 	</servlet>
 
+
 	<servlet>
 		<servlet-name>Connector</servlet-name>
 		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
@@ -123,7 +110,7 @@
 	</servlet>
 
 	<servlet-mapping>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
@@ -140,42 +127,6 @@
 
 	<jsp-config>
 		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-
-		<taglib>
-			<taglib-uri>tags-bean-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
-		</taglib>
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>
Index: lams_tool_spreadsheet/web/common/header.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/common/header.jsp	(.../header.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/common/header.jsp	(.../header.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -2,14 +2,14 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
-<c:set var="spreadsheetURL"><html:rewrite page="/includes/javascript/simple_spreadsheet/spreadsheet_offline.html"/>?lang=${pageContext.response.locale.language}</c:set>
+<c:set var="spreadsheetURL"><lams:WebAppURL/>includes/javascript/simple_spreadsheet/spreadsheet_offline.html?lang=${pageContext.response.locale.language}</c:set>
 
 <!-- ********************  CSS ********************** -->
 <lams:css />
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/spreadsheetcommon.js'/>"></script>
+<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/spreadsheetcommon.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
Index: lams_tool_spreadsheet/web/common/messages.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/common/messages.jsp	(.../messages.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/common/messages.jsp	(.../messages.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -1,8 +1,11 @@
-<%-- Error Messages --%>
-<logic:messagesPresent>
-		<lams:Alert id="errorMessages" type="danger" close="false">
-        <html:messages id="error">
-            <c:out value="${error}" escapeXml="false"/>
-        </html:messages>
-    </lams:Alert>
-</logic:messagesPresent>
+ <%@include file="/common/taglibs.jsp"%>
+ 
+ <c:set var="errorKey" value="GLOBAL" />
+        <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
+            <lams:Alert id="error" type="danger" close="false">
+                <c:forEach var="error" items="${errorMap[errorKey]}">
+                    <c:out value="${error}" />
+                </c:forEach>
+            </lams:Alert>
+        </c:if>
+
Index: lams_tool_spreadsheet/web/common/tabbedheader.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -8,7 +8,7 @@
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/spreadsheetcommon.js'/>"></script>
+<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/spreadsheetcommon.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
Index: lams_tool_spreadsheet/web/common/taglibs.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -1,11 +1,9 @@
 <%@ page language="java" errorPage="/error.jsp" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 
Index: lams_tool_spreadsheet/web/pages/authoring/advance.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -1,36 +1,34 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <!-- Advance Tab Content -->
 	
 <lams:SimplePanel titleKey="label.spreadsheet.options">
 	
 	<div class="radio">
 		<label for="learnerNotAllowedToSave">
-		<input type="radio" name="spreadsheet.learnerAllowedToSave" value="${false}" styleId="learnerNotAllowedToSave"
-			<c:if test="${not formBean.spreadsheet.learnerAllowedToSave}">checked="checked"</c:if> 
-			onclick="document.spreadsheetForm.isMarkingEnabled.disabled = true;
-					 document.spreadsheetForm.isMarkingEnabled.checked = false;"
+		<input type="radio" name="spreadsheet.learnerAllowedToSave" value="${false}" id="learnerNotAllowedToSave"
+			<c:if test="${not spreadsheetForm.spreadsheet.learnerAllowedToSave}">checked="checked"</c:if> 
+			onclick="document.forms.spreadsheetForm.isMarkingEnabled.disabled = true;
+					 document.forms.spreadsheetForm.isMarkingEnabled.checked = false;"
 		/>
 			<fmt:message key="label.authoring.advanced.play.only" />
 		</label>
 	</div>
 	
 	<div class="radio">
 		<label for="learnerAllowedToSave">
-		<input type="radio" name="spreadsheet.learnerAllowedToSave" value="${true}" styleId="learnerAllowedToSave"
-			<c:if test="${formBean.spreadsheet.learnerAllowedToSave}">checked="checked"</c:if> 
-			onclick="document.spreadsheetForm.isMarkingEnabled.disabled = false;"
+		<input type="radio" name="spreadsheet.learnerAllowedToSave" value="${true}" id="learnerAllowedToSave"
+			<c:if test="${spreadsheetForm.spreadsheet.learnerAllowedToSave}">checked="checked"</c:if> 
+			onclick="document.forms.spreadsheetForm.isMarkingEnabled.disabled = false;"
 		/>
 			<fmt:message key="label.authoring.advanced.learners.are.allowed.to.save" />
 		</label>
 	</div>
 	
 	<div class="checkbox loffset10">
 		<label for="isMarkingEnabled">
-		<html:checkbox property="spreadsheet.markingEnabled" styleId="isMarkingEnabled"
-			disabled="${not formBean.spreadsheet.learnerAllowedToSave}" >
-		</html:checkbox>
+		<form:checkbox path="spreadsheet.markingEnabled" id="isMarkingEnabled"
+			disabled="${not spreadsheetForm.spreadsheet.learnerAllowedToSave}" />
 		<fmt:message key="label.authoring.advanced.enable.spreadsheet.marking" />
 		</label>
 	</div>
@@ -40,17 +38,17 @@
 <lams:SimplePanel titleKey="label.activity.completion">
 
 	<div class="checkbox">
-		<label for="lockWhenFinished"><html:checkbox property="spreadsheet.lockWhenFinished" styleId="lockWhenFinished" />
+		<label for="lockWhenFinished"><form:checkbox path="spreadsheet.lockWhenFinished" id="lockWhenFinished" />
 		<fmt:message key="label.authoring.advance.lock.on.finished" /></label>
 	</div>
 
 	<div class="checkbox">
-		<label for="reflectOn"><html:checkbox property="spreadsheet.reflectOnActivity" styleId="reflectOn"/>
+		<label for="reflectOn"><form:checkbox path="spreadsheet.reflectOnActivity" id="reflectOn"/>
 		<fmt:message key="label.authoring.advanced.reflectOnActivity" /></label>
 		</div>
 		<div class="form-group">
-		<html:textarea property="spreadsheet.reflectInstructions" styleId="reflectInstructions"  styleClass="form-control" rows="3"
-			onkeyup="javascript:turnOnReflect()"/>
+		<textarea name="spreadsheet.reflectInstructions" id="reflectInstructions"  class="form-control" rows="3"
+			onkeyup="javascript:turnOnReflect()">${spreadsheetForm.spreadsheet.reflectInstructions}</textarea>
 	</div>
 
 </lams:SimplePanel>
Index: lams_tool_spreadsheet/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -2,7 +2,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants"%>
-<c:set var="spreadsheetURL"><html:rewrite page="/includes/javascript/simple_spreadsheet/spreadsheet_offline.html"/>?lang=${pageContext.response.locale.language}</c:set>
+<c:set var="spreadsheetURL"><lams:WebAppURL/>includes/javascript/simple_spreadsheet/spreadsheet_offline.html?lang=${pageContext.response.locale.language}</c:set>
 
 <lams:html>
 <lams:head>
@@ -37,13 +37,11 @@
     </script> 
 </lams:head>
 <body class="stripes" onLoad="init()">
-<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data" onsubmit="return onSubmitHandler();">
-	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-	<html:hidden property="spreadsheet.contentId" />
-	 <html:hidden property="mode" value="${mode}"/>
-	<html:hidden property="sessionMapID" />
-	<html:hidden property="contentFolderID" />
-	<html:hidden property="currentTab" styleId="currentTab" />
+<form:form action="updateContent.do" method="post" id="spreadsheetForm" modelAttribute="spreadsheetForm" enctype="multipart/form-data" onsubmit="return onSubmitHandler();">
+	<form:hidden path="spreadsheet.contentId" />
+	<form:hidden path="sessionMapID" />
+	<form:hidden path="contentFolderID" />
+	<form:hidden path="currentTab" id="currentTab" />
 
 	<c:set var="title"><fmt:message key="activity.title"/> ${lang}</c:set>
 	<lams:Page title="${title}" type="navbar">
@@ -68,14 +66,14 @@
 			</lams:TabBodys>
 
 		<!-- Button Row -->
-		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
-			toolSignature="<%=SpreadsheetConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.spreadsheet.contentId}" 
-			 customiseSessionID="${formBean.sessionMapID}" accessMode="${mode}" defineLater="${mode=='teacher'}"
-			 contentFolderID="${formBean.contentFolderID}" />
+		<lams:AuthoringButton formID="spreadsheetForm" clearSessionActionUrl="/clearsession.do" 
+			toolSignature="<%=SpreadsheetConstants.TOOL_SIGNATURE%>" toolContentID="${spreadsheetForm.spreadsheet.contentId}" 
+			 customiseSessionID="${spreadsheetForm.sessionMapID}" accessMode="${mode}" defineLater="${mode=='teacher'}"
+			 contentFolderID="${spreadsheetForm.contentFolderID}" />
 		</lams:TabBodyArea>
 
 		<div id="footer"></div>
 	</lams:Page>	
-</html:form>
+</form:form>
 </body>
 </lams:html>
Index: lams_tool_spreadsheet/web/pages/authoring/basic.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -1,19 +1,18 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-<html:hidden property="spreadsheet.code" styleId="spreadsheet-code"/>
+<form:hidden path="spreadsheet.code" id="spreadsheet-code"/>
 		
 <!-- Basic Tab Content -->
 <div class="form-group">
     <label for="spreadsheet.title"><fmt:message key="label.authoring.basic.title"/></label>
-    <html:text property="spreadsheet.title" styleClass="form-control"></html:text>
+    <input type="text" name="spreadsheet.title" value="${spreadsheetForm.spreadsheet.title}" class="form-control"/>
 </div>
 <div class="form-group">
     <label for="spreadsheet.instructions"><fmt:message key="label.authoring.basic.instruction" /></label>
-    <lams:CKEditor id="spreadsheet.instructions" value="${formBean.spreadsheet.instructions}" contentFolderID="${formBean.contentFolderID}"></lams:CKEditor>
+    <lams:CKEditor id="spreadsheet.instructions" value="${spreadsheetForm.spreadsheet.instructions}" contentFolderID="${spreadsheetForm.contentFolderID}"></lams:CKEditor>
 </div>
 <div class="form-group">
     <label for="spreadsheet.title"><fmt:message key="label.authoring.basic.spreadsheet"/></label>
-	<iframe id="externalSpreadsheet" name="externalSpreadsheet" src="<html:rewrite page='/includes/javascript/simple_spreadsheet/spreadsheet_offline.html'/>?lang=<%=request.getLocale().getLanguage()%>"
+	<iframe id="externalSpreadsheet" name="externalSpreadsheet" src="<lams:WebAppURL/>includes/javascript/simple_spreadsheet/spreadsheet_offline.html?lang=<%=request.getLocale().getLanguage()%>"
 		style="width:99%;" frameborder="no" height="385px" scrolling="no">
 	</iframe>
 </div>
Index: lams_tool_spreadsheet/web/pages/authoring/start.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -4,13 +4,13 @@
 <%@ include file="/common/taglibs.jsp" %>
 <html>
 	<body class="stripes">
-		<html:form action="/authoring/init.do?mode=${mode}" method="post" styleId="startForm">
-			<html:hidden property="spreadsheet.contentId"/>
-			<html:hidden property="sessionMapID" styleId="ssss"/>
-		</html:form>
+		<form:form action="init.do?mode=${mode}" method="post" modelAttribute="spreadsheetForm" id="spreadsheetForm">
+			<form:hidden path="spreadsheet.contentId"/>
+			<form:hidden path="sessionMapID" id="ssss"/>
+		</form:form>
 		
 		<script type="text/javascript">
-			document.getElementById("startForm").submit();
+			document.getElementById("spreadsheetForm").submit();
 		</script>
 	<body class="stripes">
 </html>
Index: lams_tool_spreadsheet/web/pages/learning/learning.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -110,16 +110,16 @@
 				<div class="panel panel-default">
 					<div class="panel-body">
 					<iframe
-						id="externalSpreadsheet" name="externalSpreadsheet" src="<html:rewrite page='/includes/javascript/simple_spreadsheet/spreadsheet_offline.html'/>?lang=${language}"
+						id="externalSpreadsheet" name="externalSpreadsheet" src="<lams:WebAppURL/>includes/javascript/simple_spreadsheet/spreadsheet_offline.html?lang=${language}"
 						style="width:99%;" frameborder="no" height="385px"
 						scrolling="no">
 						</iframe>
 				
 					<c:if test="${!userIsMarked && (mode != 'teacher') && (spreadsheet.learnerAllowedToSave) && !(sessionMap.lockOnFinish && sessionMap.userFinished)}">
 						<div class="space-bottom-top align-right">
-							<html:button property="SaveButton" onclick="return saveUserSpreadsheet('saveUserSpreadsheet')" styleClass="btn btn-primary voffset10 pull-right">
+							<button name="SaveButton" onclick="return saveUserSpreadsheet('saveUserSpreadsheet')" class="btn btn-primary voffset10 pull-right">
 								<fmt:message key="label.save" />
-							</html:button>
+							</button>
 						</div>
 					</c:if>		
 					</div>
@@ -144,10 +144,10 @@
 							</div>
 
 							<c:if test="${hasEditRight}">
-								<html:button property="forwardtoReflection" styleClass="btn btn-default pull-left"
+								<button name="forwardtoReflection" class="btn btn-default pull-left"
 									onclick="submitMethod('forwardtoReflection');">
 									<fmt:message key="label.edit" />
-								</html:button>
+								</button>
 							</c:if>
 							
 							<c:choose>
@@ -160,9 +160,9 @@
 							</c:choose>
 
 							<c:if test="${mode != 'teacher'}">
-								<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-default voffset10 pull-left">
+								<button name="FinishButton" onclick="return continueReflect()" class="btn btn-default voffset10 pull-left">
 								<fmt:message key="label.edit" />
-								</html:button>
+								</button>
 							</c:if>
 							
 						</div>
@@ -175,12 +175,12 @@
 			<div class="space-bottom-top align-right">
 				<c:choose>
 					<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">				
-						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-primary pull-right">
+						<button name="FinishButton" onclick="return continueReflect()" class="btn btn-primary pull-right">
 							<fmt:message key="label.continue" />
-						</html:button>
+						</button>
 					</c:when>
 					<c:otherwise>
-						<html:link href="#nogo" styleClass="btn btn-primary pull-right na" styleId="finishButton" onclick="return finishSession()">
+						<a href="#nogo" class="btn btn-primary pull-right na" id="finishButton" onclick="return finishSession()">
 							<c:choose>
 			 					<c:when test="${sessionMap.activityPosition.last}">
 			 						<fmt:message key="label.submit" />
@@ -189,7 +189,7 @@
 			 		 				<fmt:message key="label.finished" />
 			 					</c:otherwise>
 			 				</c:choose>
-						</html:link>
+						</a>
 					</c:otherwise>
 				</c:choose>
 			</div>
Index: lams_tool_spreadsheet/web/pages/learning/notebook.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -12,7 +12,7 @@
 		}
 		
 		function submitForm(methodName){
-			var f = document.getElementById('messageForm');
+			var f = document.getElementById('reflectionForm');
 			f.submit();
 		}
 	</script>
@@ -22,21 +22,21 @@
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-	<lams:Page type="learner" title="${sessionMap.title}">
+	<lams:Page type="learner" title="${sessionMap.title}" formID="reflectionForm">
 	
-	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
-		<html:hidden property="userID" />
-		<html:hidden property="sessionMapID" />
+	<form:form action="submitReflection.do" method="post" onsubmit="disableFinishButton();" id="reflectionForm" modelAttribute="reflectionForm">
+		<form:hidden path="userID" />
+		<form:hidden path="sessionMapID" />
 
 			<%@ include file="/common/messages.jsp"%>
 
 			<p>
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 			</p>
 
-			<html:textarea styleId="focused" rows="5" property="entryText" styleClass="form-control"></html:textarea>
+			<textarea id="focused" rows="5" name="entryText" class="form-control">${reflectionForm.entryText}</textarea>
 
-			<html:link href="#nogo" styleClass="btn btn-primary voffset5 pull-right na" styleId="finishButton" onclick="submitForm('finish')">
+			<a href="#nogo" class="btn btn-primary voffset5 pull-right na" id="finishButton" onclick="submitForm('finish')">
 				<c:choose>
 					<c:when test="${sessionMap.activityPosition.last}">
 						<fmt:message key="label.submit" />
@@ -45,9 +45,9 @@
 						<fmt:message key="label.finished" />
 					</c:otherwise>
 				</c:choose>
-			</html:link>
+			</a>
 
-	</html:form>
+	</form:form>
 	
 	<div id="footer"/>
 	
Index: lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -30,11 +30,11 @@
 	</tr>
 </table>
 
-<c:url  var="authoringUrl" value="/definelater.do">
+<c:url  var="authoringUrl" value="/authoring/init.do">
 	<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 	<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 </c:url>
-<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
+<a href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" class="btn btn-default pull-right">
 	<fmt:message key="label.monitoring.edit.activity.edit" />
-</html:link>
+</a>
  
\ No newline at end of file
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	(.../editmark.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	(.../editmark.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -11,41 +11,40 @@
 	
 	<c:set var="title"><fmt:message key="label.monitoring.summary.marking.marking" /></c:set>
 
-	<html:form action="/monitoring/saveMark" method="post" styleId="markForm" focus="marks">
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" /> 
+	<form:form action="saveMark.do" method="post" modelAttribute="markForm" id="markForm" focus="marks">
 
-	<lams:Page type="learner" title="${title}">
+	<lams:Page type="learner" title="${title}" formID="markForm">
 	
 		<!-- Basic Info Form-->
  		<%@ include file="/common/messages.jsp"%>
 
-		<p><fmt:message key="label.reviewitem.spreadsheet.sent.by" />&nbsp;<strong>${formBean.userName}</strong></p>
+		<p><fmt:message key="label.reviewitem.spreadsheet.sent.by" />&nbsp;<strong>${markForm.userName}</strong></p>
 		
-		<c:set var="sessionMapID" value="${formBean.sessionMapID}" />				
+		<c:set var="sessionMapID" value="${markForm.sessionMapID}" />				
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-		<html:hidden property="sessionMapID" />
-		<html:hidden property="userUid" />
-		<html:hidden property="code" />
-		<html:hidden property="userName" />
+		<form:hidden path="sessionMapID" />
+		<form:hidden path="userUid" />
+		<form:hidden path="code" />
+		<form:hidden path="userName" />
 		
 		<div class="form-group">
 			<label for="marks"><fmt:message key="label.monitoring.summary.marking.marks" /></label>
-        		<html:text property="marks" size="10" style="form-control form-control-inline"/>
+        		<input type="text" name="marks" size="10" value="${markForm.marks}" style="form-control form-control-inline"/>
 		</div>
 
 		<div class="form-group">
            	<label for="comments"><fmt:message key="label.monitoring.summary.marking.comments" /></label>
-           	<lams:CKEditor id="comments" value="${formBean.comments}" contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
+           	<lams:CKEditor id="comments" value="${markForm.comments}" contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
 		</div>
 	
 		<c:choose>
-			<c:when test="${empty formBean.code}">
+			<c:when test="${empty markForm.code}">
 				<lams:Alert type="info" id="no-spreadsheet" close="false">
 					<fmt:message key="label.reviewitem.user.hasnot.sent.spreadsheet" />
 				</lams:Alert>
 			</c:when>
 			<c:otherwise>
-			    <html:hidden property="spreadsheetCode" styleId="spreadsheet-code" value="${formBean.code}"/>	
+			    <form:hidden path="code" id="spreadsheet-code" value="${markForm.code}"/>	
 				<iframe
 					id="externalSpreadsheet" name="externalSpreadsheet" src="${spreadsheetURL}"
 					style="width:99%" frameborder="no" height="385px"
@@ -67,7 +66,7 @@
 		
 	</lams:Page>
 	
-	</html:form> 
+	</form:form> 
 
 	
 	</body>
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp	(.../summarylist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp	(.../summarylist.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -162,25 +162,25 @@
 			
 			<c:if test="${spreadsheet.markingEnabled}">	
 				<p>
-					<html:link href="javascript:viewAllMarks(${summary.sessionId});"
-						property="viewAllMarks" styleClass="btn btn-default voffset10 loffset5">
+					<a href="javascript:viewAllMarks(${summary.sessionId});"
+						name="viewAllMarks" class="btn btn-default voffset10 loffset5">
 						<fmt:message key="label.monitoring.summary.viewAllMarks.button" />
-					</html:link>
-					<html:link href="javascript:releaseMarks(${summary.sessionId});"
-						property="releaseMarks" styleClass="btn btn-default voffset10 loffset5">
+					</a>
+					<a href="javascript:releaseMarks(${summary.sessionId});"
+						name="releaseMarks" class="btn btn-default voffset10 loffset5">
 						<fmt:message key="label.monitoring.summary.releaseMarks.button" />
-					</html:link>
-	 				<html:link href="javascript:downloadMarks(${summary.sessionId});"
-						property="downloadMarks" styleClass="btn btn-default voffset10 loffset5">
+					</a>
+	 				<a href="javascript:downloadMarks(${summary.sessionId});"
+						name="downloadMarks" class="btn btn-default voffset10 loffset5">
 						<fmt:message key="label.monitoring.summary.downloadMarks.button" />
-					</html:link>
+					</a>
 					<c:url value="/monitoring/summary.do" var="refreshMonitoring">
 						<c:param name="contentFolderID" value="${sessionMap.contentFolderID}"/>
 						<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 					</c:url>
-					<html:link href="${refreshMonitoring}" styleClass="btn btn-default loffset5 voffset10" >
+					<a href="${refreshMonitoring}" class="btn btn-default loffset5 voffset10" >
 						<fmt:message key="label.refresh" />
-					</html:link>
+					</a>
 				</p>
 			</c:if>
 		
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/viewallmarks.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/pages/monitoring/parts/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -50,10 +50,10 @@
 								</c:choose>
 								<c:if test="${user.userModifiedSpreadsheet != null}">
 									<c:set var="editUrl"><c:url value="/monitoring/editMark.do"/>?userUid=${user.uid}&toolContentID=${sessionMap.toolContentID}&sessionMapID=${sessionMapID}</c:set>
-									<html:link href="javascript:launchPopup('${editUrl}');" 
-										property="submit" styleClass="btn btn-default btn-sm loffset5">
+									<a href="javascript:launchPopup('${editUrl}');" 
+										name="submit" class="btn btn-default btn-sm loffset5">
 										<fmt:message key="label.monitoring.vieawallmarks.update.marks" />
-									</html:link>
+									</a>
 								</c:if>
 							</div>
 						</div>
@@ -78,9 +78,9 @@
 				</div>
 				</div>
 				
-				<html:link href="javascript:window.close();" property="submit" styleClass="btn btn-default">
+				<a href="javascript:window.close();" name="submit" class="btn btn-default">
 						<fmt:message key="button.close" />
-				</html:link>
+				</a>
 
 		<div id="footer"></div>
 
Index: lams_tool_spreadsheet/web/pages/reviewitem/reviewitem.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6
--- lams_tool_spreadsheet/web/pages/reviewitem/reviewitem.jsp	(.../reviewitem.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/reviewitem/reviewitem.jsp	(.../reviewitem.jsp)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
@@ -22,7 +22,7 @@
 					</lams:Alert>
 				</c:when>
 				<c:otherwise>
-				    <html:hidden property="spreadsheetCode" styleId="spreadsheet-code" value="${code}"/>	
+				    <form:hidden path="code" id="spreadsheet-code" value="${code}"/>	
 					<iframe
 						id="externalSpreadsheet" name="externalSpreadsheet" src="${spreadsheetURL}"
 						style="width:99%;" frameborder="no" height="385px"