Index: lams_tool_doku/build.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/build.xml	(.../build.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/build.xml	(.../build.xml)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -18,7 +18,7 @@
 	<target name="_copy-websocket">
 		<echo>${ant.project.name}: Copying additional Java classes to WAR</echo>
 		<copy todir="${basedir}/build/war/WEB-INF/classes"
-			  file="${basedir}/build/classes/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.class"
+			  file="${basedir}/build/classes/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.class"
 			  verbose="true"
 		/>
 	</target>
Fisheye: Tag 1cef918442124e8d987a285095a7504e3bc00461 refers to a dead (removed) revision in file `lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AdminAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1cef918442124e8d987a285095a7504e3bc00461 refers to a dead (removed) revision in file `lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1cef918442124e8d987a285095a7504e3bc00461 refers to a dead (removed) revision in file `lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1cef918442124e8d987a285095a7504e3bc00461 refers to a dead (removed) revision in file `lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1cef918442124e8d987a285095a7504e3bc00461 refers to a dead (removed) revision in file `lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1cef918442124e8d987a285095a7504e3bc00461 refers to a dead (removed) revision in file `lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AdminController.java
===================================================================
diff -u
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AdminController.java	(revision 0)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AdminController.java	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -0,0 +1,64 @@
+package org.lamsfoundation.lams.tool.dokumaran.web.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranConfigItem;
+import org.lamsfoundation.lams.tool.dokumaran.service.IDokumaranService;
+import org.lamsfoundation.lams.tool.dokumaran.web.form.AdminForm;
+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;
+
+/**
+ * @author Andrey Balan
+ */
+@Controller
+@RequestMapping("/ladoku11admin")
+public class AdminController {
+
+    @Autowired
+    @Qualifier("dokumaranService")
+    private IDokumaranService dokumaranService;
+
+    @RequestMapping("")
+    public String unspecified(@ModelAttribute("ladoku11adminForm") AdminForm ladoku11adminForm,
+	    HttpServletRequest request) {
+
+	DokumaranConfigItem etherpadUrl = dokumaranService.getConfigItem(DokumaranConfigItem.KEY_ETHERPAD_URL);
+	if (etherpadUrl != null) {
+	    ladoku11adminForm.setEtherpadUrl(etherpadUrl.getConfigValue());
+	}
+
+	DokumaranConfigItem apiKey = dokumaranService.getConfigItem(DokumaranConfigItem.KEY_API_KEY);
+	if (apiKey != null) {
+	    ladoku11adminForm.setApiKey(apiKey.getConfigValue());
+	}
+
+	request.setAttribute("error", false);
+	return "pages/admin/config";
+    }
+
+    @RequestMapping("/saveContent")
+    public String saveContent(@ModelAttribute("ladoku11adminForm") AdminForm ladoku11adminForm,
+	    HttpServletRequest request) {
+
+	if (ladoku11adminForm.getApiKey() != null && !ladoku11adminForm.getApiKey().equals("")) {
+
+	    DokumaranConfigItem etherpadUrl = dokumaranService.getConfigItem(DokumaranConfigItem.KEY_ETHERPAD_URL);
+	    etherpadUrl.setConfigValue(ladoku11adminForm.getEtherpadUrl());
+	    dokumaranService.saveOrUpdateDokumaranConfigItem(etherpadUrl);
+
+	    DokumaranConfigItem apiKey = dokumaranService.getConfigItem(DokumaranConfigItem.KEY_API_KEY);
+	    apiKey.setConfigValue(ladoku11adminForm.getApiKey());
+	    dokumaranService.saveOrUpdateDokumaranConfigItem(apiKey);
+
+	    request.setAttribute("savedSuccess", true);
+	    return "pages/admin/config";
+	} else {
+	    request.setAttribute("error", true);
+	    return "pages/admin/config";
+	}
+    }
+}
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java
===================================================================
diff -u
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java	(revision 0)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -0,0 +1,244 @@
+/****************************************************************
+ * 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.dokumaran.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.dokumaran.DokumaranConstants;
+import org.lamsfoundation.lams.tool.dokumaran.model.Dokumaran;
+import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranUser;
+import org.lamsfoundation.lams.tool.dokumaran.service.IDokumaranService;
+import org.lamsfoundation.lams.tool.dokumaran.web.form.DokumaranForm;
+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;
+
+/**
+ * @author Steve.Ni
+ */
+@Controller
+@RequestMapping("/authoring")
+public class AuthoringController {
+
+    private static Logger log = Logger.getLogger(AuthoringController.class);
+
+    @Autowired
+    @Qualifier("dokumaranService")
+    private IDokumaranService dokumaranService;
+
+    /**
+     * Read dokumaran 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",
+     *
+     * @throws ServletException
+     *
+     */
+    @RequestMapping("/start")
+    private String start(@ModelAttribute("authoringForm") DokumaranForm authoringForm, HttpServletRequest request)
+	    throws ServletException {
+	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+	return starting(authoringForm, request);
+    }
+
+    @RequestMapping("/definelater")
+    private String definelater(@ModelAttribute("authoringForm") DokumaranForm authoringForm, HttpServletRequest request)
+	    throws ServletException {
+	Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+	Dokumaran dokumaran = dokumaranService.getDokumaranByContentId(contentId);
+
+	dokumaran.setDefineLater(true);
+	dokumaranService.saveOrUpdateDokumaran(dokumaran);
+
+	//audit log the teacher has started editing activity in monitor
+	dokumaranService.auditLogStartEditingActivityInMonitor(contentId);
+
+	request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString());
+	return starting(authoringForm, request);
+    }
+
+    private String starting(@ModelAttribute("authoringForm") DokumaranForm authoringForm, HttpServletRequest request)
+	    throws ServletException {
+
+	// save toolContentID into HTTPSession
+	Long contentId = new Long(WebUtil.readLongParam(request, DokumaranConstants.PARAM_TOOL_CONTENT_ID));
+
+	// get back the dokumaran and item list and display them on page
+
+	Dokumaran dokumaran = null;
+
+	// Get contentFolderID and save to form.
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	authoringForm.setContentFolderID(contentFolderID);
+
+	// initial Session Map
+	SessionMap<String, Object> sessionMap = new SessionMap<>();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+	authoringForm.setSessionMapID(sessionMap.getSessionID());
+
+	try {
+	    dokumaran = dokumaranService.getDokumaranByContentId(contentId);
+	    // if dokumaran does not exist, try to use default content instead.
+	    if (dokumaran == null) {
+		dokumaran = dokumaranService.getDefaultContent(contentId);
+	    }
+
+	    authoringForm.setDokumaran(dokumaran);
+	} catch (Exception e) {
+	    AuthoringController.log.error(e);
+	    throw new ServletException(e);
+	}
+
+	sessionMap.put(DokumaranConstants.ATTR_RESOURCE_FORM, authoringForm);
+	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.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     */
+
+    @RequestMapping("/init")
+    private String initPage(@ModelAttribute("authoringForm") DokumaranForm authoringForm, HttpServletRequest request)
+	    throws ServletException {
+	String sessionMapID = WebUtil.readStrParam(request, DokumaranConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	DokumaranForm existForm = (DokumaranForm) sessionMap.get(DokumaranConstants.ATTR_RESOURCE_FORM);
+
+	try {
+	    PropertyUtils.copyProperties(authoringForm, existForm);
+	} catch (Exception e) {
+	    throw new ServletException(e);
+	}
+
+	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+	authoringForm.setMode(mode.toString());
+
+	return "pages/authoring/authoring";
+    }
+
+    /**
+     * This method will persist all inforamtion in this authoring page, include
+     * all dokumaran item, information etc.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws ServletException
+     */
+
+    @RequestMapping("/update")
+    private String updateContent(@ModelAttribute("authoringForm") DokumaranForm authoringForm,
+	    HttpServletRequest request) throws Exception {
+
+	// get back sessionMAP
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(authoringForm.getSessionMapID());
+	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
+	Dokumaran dokumaran = authoringForm.getDokumaran();
+
+	// **********************************Get Dokumaran PO*********************
+	Dokumaran dokumaranPO = dokumaranService.getDokumaranByContentId(dokumaran.getContentId());
+	if (dokumaranPO == null) {
+	    // new Dokumaran, create it
+	    dokumaranPO = dokumaran;
+	    dokumaranPO.setCreated(new Timestamp(new Date().getTime()));
+	    dokumaranPO.setUpdated(new Timestamp(new Date().getTime()));
+
+	} else {
+	    Long uid = dokumaranPO.getUid();
+	    PropertyUtils.copyProperties(dokumaranPO, dokumaran);
+
+	    // copyProperties() above may result in "collection assigned to two objects in a session" exception
+	    // Below we remove reference to one of Assessment objects,
+	    // so maybe there will be just one object in session when save is done
+	    // If this fails, we may have to evict the object from session using DAO
+	    authoringForm.setDokumaran(null);
+	    dokumaran = null;
+	    // get back UID
+	    dokumaranPO.setUid(uid);
+
+	    // if it's a teacher - change define later status
+	    if (mode.isTeacher()) {
+		dokumaranPO.setDefineLater(false);
+	    }
+	    dokumaranPO.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);
+	DokumaranUser dokumaranUser = dokumaranService.getUserByIDAndContent(new Long(user.getUserID().intValue()),
+		dokumaranPO.getContentId());
+	if (dokumaranUser == null) {
+	    dokumaranUser = new DokumaranUser(user, dokumaranPO);
+	}
+
+	dokumaranPO.setCreatedBy(dokumaranUser);
+
+	// ***************************** finally persist dokumaranPO again
+	dokumaranService.saveOrUpdateDokumaran(dokumaranPO);
+
+	authoringForm.setDokumaran(dokumaranPO);
+
+	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+
+	return "pages/authoring/authoring";
+    }
+
+}
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/ClearSessionController.java
===================================================================
diff -u
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/ClearSessionController.java	(revision 0)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/ClearSessionController.java	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -0,0 +1,64 @@
+/****************************************************************
+ * 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.dokumaran.web.controller;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+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 {
+
+    @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) {
+	if (mode.isAuthor()) {
+	    session.removeAttribute(customiseSessionID);
+	}
+    }
+
+}
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
===================================================================
diff -u
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java	(revision 0)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -0,0 +1,379 @@
+/****************************************************************
+ * 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.dokumaran.web.controller;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+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.dokumaran.DokumaranConstants;
+import org.lamsfoundation.lams.tool.dokumaran.model.Dokumaran;
+import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranConfigItem;
+import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranSession;
+import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranUser;
+import org.lamsfoundation.lams.tool.dokumaran.service.DokumaranApplicationException;
+import org.lamsfoundation.lams.tool.dokumaran.service.DokumaranConfigurationException;
+import org.lamsfoundation.lams.tool.dokumaran.service.IDokumaranService;
+import org.lamsfoundation.lams.tool.dokumaran.web.form.ReflectionForm;
+import org.lamsfoundation.lams.usermanagement.User;
+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.context.WebApplicationContext;
+
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * @author Steve.Ni
+ */
+@Controller
+@RequestMapping("/learning")
+public class LearningController {
+
+    private static Logger log = Logger.getLogger(LearningController.class);
+
+    @Autowired
+    @Qualifier("dokumaranService")
+    private IDokumaranService dokumaranService;
+
+    @Autowired
+    private WebApplicationContext applicationContext;
+
+    /**
+     * Read dokumaran 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",
+     *
+     * @throws DokumaranConfigurationException
+     * @throws URISyntaxException
+     *
+     */
+    @RequestMapping("/start")
+    private String start(HttpServletRequest request, HttpServletResponse response)
+	    throws DokumaranConfigurationException, DokumaranApplicationException, URISyntaxException {
+
+	// initial Session Map
+	SessionMap<String, Object> sessionMap = new SessionMap<>();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+	request.setAttribute(DokumaranConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+
+	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
+	Long toolSessionId = new Long(request.getParameter(DokumaranConstants.PARAM_TOOL_SESSION_ID));
+	Dokumaran dokumaran = dokumaranService.getDokumaranBySessionId(toolSessionId);
+	request.setAttribute(DokumaranConstants.ATTR_TOOL_CONTENT_ID, dokumaran.getContentId());
+	DokumaranSession session = dokumaranService.getDokumaranSessionBySessionId(toolSessionId);
+
+	// get back the dokumaran and item list and display them on page
+	DokumaranUser user = null;
+	boolean isFirstTimeAccess = false;
+	if ((mode != null) && mode.isTeacher()) {
+	    // monitoring mode - user is specified in URL
+	    // dokumaranUser may be null if the user was force completed.
+	    user = getSpecifiedUser(dokumaranService, toolSessionId, WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, false));
+	} else {
+	    // get back login user DTO
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO userDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    user = dokumaranService.getUserByIDAndSession(new Long(userDto.getUserID().intValue()), toolSessionId);
+	    if (user == null) {
+		user = new DokumaranUser(userDto, session);
+		dokumaranService.saveUser(user);
+		isFirstTimeAccess = true;
+	    }
+	}
+
+	// support for leader select feature
+	List<DokumaranUser> leaders = dokumaran.isUseSelectLeaderToolOuput()
+		? dokumaranService.checkLeaderSelectToolForSessionLeader(user, new Long(toolSessionId).longValue(),
+			isFirstTimeAccess)
+		: new ArrayList<>();
+	// forwards to the leaderSelection page
+	if (dokumaran.isUseSelectLeaderToolOuput() && leaders.isEmpty() && !mode.isTeacher()) {
+
+	    // get group users and store it to request as DTO objects
+	    List<DokumaranUser> groupUsers = dokumaranService.getUsersBySession(toolSessionId);
+	    List<User> groupUserDtos = new ArrayList<>();
+	    for (DokumaranUser groupUser : groupUsers) {
+		User groupUserDto = new User();
+		groupUserDto.setFirstName(groupUser.getFirstName());
+		groupUserDto.setLastName(groupUser.getLastName());
+		groupUserDtos.add(groupUserDto);
+	    }
+	    request.setAttribute(DokumaranConstants.ATTR_GROUP_USERS, groupUserDtos);
+	    request.setAttribute(DokumaranConstants.ATTR_DOKUMARAN, dokumaran);
+	    return "pages/learning/waitforleader";
+	}
+	//time limit is set but hasn't yet launched by a teacher - show waitForTimeLimitLaunch page
+	if (dokumaran.getTimeLimit() > 0 && dokumaran.getTimeLimitLaunchedDate() == null) {
+	    return "pages/learning/waitForTimeLimitLaunch";
+	}
+
+	boolean isUserLeader = (user != null) && dokumaranService.isUserLeader(leaders, user.getUserId());
+
+	// check whether finish lock is on/off
+	boolean finishedLock = dokumaran.getLockWhenFinished() && (user != null) && user.isSessionFinished();
+	boolean hasEditRight = !dokumaran.isUseSelectLeaderToolOuput()
+		|| dokumaran.isUseSelectLeaderToolOuput() && isUserLeader;
+
+	// basic information
+	sessionMap.put(DokumaranConstants.ATTR_TITLE, dokumaran.getTitle());
+	sessionMap.put(DokumaranConstants.ATTR_INSTRUCTIONS, dokumaran.getInstructions());
+	sessionMap.put(DokumaranConstants.ATTR_FINISH_LOCK, finishedLock);
+	sessionMap.put(DokumaranConstants.ATTR_LOCK_ON_FINISH, dokumaran.getLockWhenFinished());
+	sessionMap.put(DokumaranConstants.ATTR_USER_FINISHED, (user != null) && user.isSessionFinished());
+	sessionMap.put(DokumaranConstants.ATTR_HAS_EDIT_RIGHT, hasEditRight);
+	sessionMap.put(DokumaranConstants.ATTR_IS_LEADER_RESPONSE_FINALIZED,
+		dokumaranService.isLeaderResponseFinalized(leaders));
+	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId);
+	sessionMap.put(AttributeNames.ATTR_MODE, mode);
+
+	// reflection information
+	String entryText = new String();
+	if (user != null) {
+	    NotebookEntry notebookEntry = dokumaranService.getEntry(toolSessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		    DokumaranConstants.TOOL_SIGNATURE, user.getUserId().intValue());
+	    if (notebookEntry != null) {
+		entryText = notebookEntry.getEntry();
+	    }
+	}
+	sessionMap.put(DokumaranConstants.ATTR_REFLECTION_ON, dokumaran.isReflectOnActivity());
+	sessionMap.put(DokumaranConstants.ATTR_REFLECTION_INSTRUCTION, dokumaran.getReflectInstructions());
+	sessionMap.put(DokumaranConstants.ATTR_REFLECTION_ENTRY, entryText);
+
+	// add define later support
+	if (dokumaran.isDefineLater()) {
+	    return "pages/learning/definelater";
+	}
+
+	// set contentInUse flag to true!
+	dokumaran.setContentInUse(true);
+	dokumaran.setDefineLater(false);
+	dokumaranService.saveOrUpdateDokumaran(dokumaran);
+
+	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(
+		toolSessionId, request, applicationContext.getServletContext());
+	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
+
+	sessionMap.put(DokumaranConstants.ATTR_DOKUMARAN, dokumaran);
+
+	// get the API key from the config table and add it to the session
+	DokumaranConfigItem etherpadServerUrlConfig = dokumaranService
+		.getConfigItem(DokumaranConfigItem.KEY_ETHERPAD_URL);
+	DokumaranConfigItem apiKeyConfig = dokumaranService.getConfigItem(DokumaranConfigItem.KEY_API_KEY);
+	if (apiKeyConfig == null || apiKeyConfig.getConfigValue() == null || etherpadServerUrlConfig == null
+		|| etherpadServerUrlConfig.getConfigValue() == null) {
+	    return "pages/learning/notconfigured";
+	}
+	String etherpadServerUrl = etherpadServerUrlConfig.getConfigValue();
+	request.setAttribute(DokumaranConstants.KEY_ETHERPAD_SERVER_URL, etherpadServerUrl);
+
+	//time limit
+	boolean isTimeLimitEnabled = hasEditRight && !finishedLock && dokumaran.getTimeLimit() != 0;
+	long secondsLeft = isTimeLimitEnabled ? dokumaranService.getSecondsLeft(dokumaran) : 0;
+	request.setAttribute(DokumaranConstants.ATTR_SECONDS_LEFT, secondsLeft);
+
+	boolean isTimeLimitExceeded = dokumaranService.checkTimeLimitExceeded(dokumaran);
+
+	String padId = session.getPadId();
+	//in case of non-leader or finished lock or isTimeLimitExceeded - show Etherpad in readonly mode
+	if (dokumaran.isUseSelectLeaderToolOuput() && !isUserLeader || finishedLock || isTimeLimitExceeded) {
+	    padId = session.getEtherpadReadOnlyId();
+	    //in case Etherpad didn't have enough time to initialize - show notconfigured.jsp
+	    if (padId == null) {
+		return "pages/learning/notconfigured";
+	    }
+	}
+	request.setAttribute(DokumaranConstants.ATTR_PAD_ID, padId);
+
+	//add new sessionID cookie in order to access pad
+	if (user != null) {
+	    Cookie etherpadSessionCookie = dokumaranService.createEtherpadCookieForLearner(user, session);
+	    response.addCookie(etherpadSessionCookie);
+	}
+
+	return "pages/learning/learning";
+    }
+
+    /**
+     * Checks Leader Progress
+     */
+    @RequestMapping("/checkLeaderProgress")
+    private String checkLeaderProgress(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+	Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	boolean isLeaderResponseFinalized = dokumaranService.isLeaderResponseFinalized(toolSessionId);
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.put(DokumaranConstants.ATTR_IS_LEADER_RESPONSE_FINALIZED, isLeaderResponseFinalized);
+	response.setContentType("application/x-json;charset=utf-8");
+	response.getWriter().print(responseJSON);
+	return responseJSON.toString();
+    }
+
+    /**
+     * Finish learning session.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/finish")
+    private String finish(@ModelAttribute("reflectionForm") ReflectionForm reflectionForm, HttpServletRequest request) {
+
+	// get back SessionMap
+	String sessionMapID = request.getParameter(DokumaranConstants.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);
+
+	// get sessionId from HttpServletRequest
+	String nextActivityUrl = null;
+	try {
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    Long userID = new Long(user.getUserID().longValue());
+
+	    nextActivityUrl = dokumaranService.finishToolSession(sessionId, userID);
+	    request.setAttribute(DokumaranConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl);
+	} catch (DokumaranApplicationException e) {
+	    LearningController.log.error("Failed get next activity url:" + e.getMessage());
+	}
+
+	return "pages/learning/finish";
+    }
+
+    /**
+     * Display empty reflection form.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/newReflection")
+    private String newReflection(@ModelAttribute("reflectionForm") ReflectionForm reflectionForm,
+	    HttpServletRequest request) {
+
+	// get session value
+	String sessionMapID = WebUtil.readStrParam(request, DokumaranConstants.ATTR_SESSION_MAP_ID);
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
+	reflectionForm.setUserID(user.getUserID());
+	reflectionForm.setSessionMapID(sessionMapID);
+
+	// get the existing reflection entry
+
+	SessionMap<String, Object> map = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
+	Long toolSessionID = (Long) map.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	NotebookEntry entry = dokumaranService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
+		DokumaranConstants.TOOL_SIGNATURE, user.getUserID());
+
+	if (entry != null) {
+	    reflectionForm.setEntryText(entry.getEntry());
+	}
+
+	return "pages/learning/notebook";
+    }
+
+    /**
+     * Submit reflection form input database.
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/submitReflection")
+    private String submitReflection(@ModelAttribute("reflectionForm") ReflectionForm reflectionForm,
+	    HttpServletRequest request) {
+	Integer userId = reflectionForm.getUserID();
+
+	String sessionMapID = WebUtil.readStrParam(request, DokumaranConstants.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 = dokumaranService.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		DokumaranConstants.TOOL_SIGNATURE, userId);
+
+	if (entry == null) {
+	    // create new entry
+	    dokumaranService.createNotebookEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		    DokumaranConstants.TOOL_SIGNATURE, userId, reflectionForm.getEntryText());
+	} else {
+	    // update existing entry
+	    entry.setEntry(reflectionForm.getEntryText());
+	    entry.setLastModified(new Date());
+	    dokumaranService.updateEntry(entry);
+	}
+
+	return finish(reflectionForm, request);
+    }
+
+    // *************************************************************************************
+    // Private method
+    // *************************************************************************************
+
+    private DokumaranUser getSpecifiedUser(IDokumaranService service, Long sessionId, Integer userId) {
+	DokumaranUser dokumaranUser = service.getUserByIDAndSession(new Long(userId.intValue()), sessionId);
+	if (dokumaranUser == null) {
+	    LearningController.log.error(
+		    "Unable to find specified user for dokumaran activity. Screens are likely to fail. SessionId="
+			    + sessionId + " UserId=" + userId);
+	}
+	return dokumaranUser;
+    }
+}
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
===================================================================
diff -u
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java	(revision 0)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -0,0 +1,203 @@
+package org.lamsfoundation.lams.tool.dokumaran.web.controller;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.websocket.CloseReason;
+import javax.websocket.CloseReason.CloseCodes;
+import javax.websocket.OnClose;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.ServerEndpoint;
+
+import org.apache.log4j.Logger;
+
+
+import org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants;
+import org.lamsfoundation.lams.tool.dokumaran.model.Dokumaran;
+import org.lamsfoundation.lams.tool.dokumaran.service.IDokumaranService;
+import org.lamsfoundation.lams.util.hibernate.HibernateSessionManager;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * Sends time limit start and +1min events to learners.
+ *
+ * @author Marcin Cieslak
+ * @author Andrey Balan
+ */
+@ServerEndpoint("/learningWebsocket")
+public class LearningWebsocketServer {
+
+    /**
+     * A singleton which updates Learners with Leader selection.
+     */
+    private static class SendWorker extends Thread {
+	private boolean stopFlag = false;
+	// how ofter the thread runs
+	private static final long CHECK_INTERVAL = 3000;
+
+	@Override
+	public void run() {
+	    while (!stopFlag) {
+		try {
+		    // websocket communication bypasses standard HTTP filters, so Hibernate session needs to be initialised manually
+		    HibernateSessionManager.openSession();
+		    Iterator<Entry<Long, Set<Session>>> entryIterator = LearningWebsocketServer.websockets.entrySet()
+			    .iterator();
+		    // go through activities and update registered learners with reports and vote count
+		    while (entryIterator.hasNext()) {
+			Entry<Long, Set<Session>> entry = entryIterator.next();
+			Long toolContentId = entry.getKey();
+			// if all learners left the activity, remove the obsolete mapping
+			Set<Session> dokuWebsockets = entry.getValue();
+			if (dokuWebsockets.isEmpty()) {
+			    entryIterator.remove();
+			    timeLimitCache.remove(toolContentId);
+			    continue;
+			}
+
+			Dokumaran dokumaran = LearningWebsocketServer.getDokumaranService()
+				.getDokumaranByContentId(toolContentId);
+			int timeLimit = dokumaran.getTimeLimit();
+			if (dokumaran.getTimeLimitLaunchedDate() != null && timeLimit != 0) {
+			    Integer cachedTimeLimit = timeLimitCache.get(toolContentId);
+			    if (cachedTimeLimit == null) {
+				timeLimitCache.put(toolContentId, timeLimit);
+				LearningWebsocketServer.sendPageRefreshRequest(toolContentId);
+			    } else if (!cachedTimeLimit.equals(timeLimit)) {
+				timeLimitCache.put(toolContentId, timeLimit);
+				LearningWebsocketServer.sendAddTimeRequest(toolContentId, timeLimit - cachedTimeLimit);
+			    }
+			}
+		    }
+		} catch (Exception e) {
+		    // error caught, but carry on
+		    LearningWebsocketServer.log.error("Error in Dokumaran worker thread", e);
+		} finally {
+		    HibernateSessionManager.closeSession();
+		    try {
+			Thread.sleep(SendWorker.CHECK_INTERVAL);
+		    } catch (InterruptedException e) {
+			LearningWebsocketServer.log.warn("Stopping Dokumaran worker thread");
+			stopFlag = true;
+		    }
+		}
+	    }
+	}
+    };
+
+    private static final Logger log = Logger.getLogger(LearningWebsocketServer.class);
+
+    private static final SendWorker sendWorker = new SendWorker();
+    private static final Map<Long, Set<Session>> websockets = new ConcurrentHashMap<>();
+    private static final Map<Long, Integer> timeLimitCache = new ConcurrentHashMap<>();
+
+    private static IDokumaranService dokumaranService;
+
+    static {
+	// run the singleton thread
+	LearningWebsocketServer.sendWorker.start();
+    }
+
+    /**
+     * Registeres the Learner for processing.
+     */
+    @OnOpen
+    public void registerUser(Session websocket) throws IOException {
+	Long toolContentID = Long
+		.valueOf(websocket.getRequestParameterMap().get(AttributeNames.PARAM_TOOL_CONTENT_ID).get(0));
+	Set<Session> toolContentWebsockets = websockets.get(toolContentID);
+	if (toolContentWebsockets == null) {
+	    toolContentWebsockets = ConcurrentHashMap.newKeySet();
+	    websockets.put(toolContentID, toolContentWebsockets);
+	}
+	toolContentWebsockets.add(websocket);
+
+	if (log.isDebugEnabled()) {
+	    log.debug("User " + websocket.getUserPrincipal().getName() + " entered Dokumaran with toolContentId: "
+		    + toolContentID);
+	}
+    }
+
+    /**
+     * When user leaves the activity.
+     */
+    @OnClose
+    public void unregisterUser(Session websocket, CloseReason reason) {
+	Long toolContentID = Long
+		.valueOf(websocket.getRequestParameterMap().get(AttributeNames.PARAM_TOOL_CONTENT_ID).get(0));
+	websockets.get(toolContentID).remove(websocket);
+
+	if (log.isDebugEnabled()) {
+	    // If there was something wrong with the connection, put it into logs.
+	    log.debug("User " + websocket.getUserPrincipal().getName() + " left Dokumaran with Tool Content ID: "
+		    + toolContentID
+		    + (!(reason.getCloseCode().equals(CloseCodes.GOING_AWAY)
+			    || reason.getCloseCode().equals(CloseCodes.NORMAL_CLOSURE))
+				    ? ". Abnormal close. Code: " + reason.getCloseCode() + ". Reason: "
+					    + reason.getReasonPhrase()
+				    : ""));
+	}
+    }
+
+    /**
+     * Monitor has added one more minute to the time limit. All learners will need
+     * to add +1 minute to their countdown counters.
+     */
+    private static void sendAddTimeRequest(Long toolContentId, int timeLimit) throws IOException {
+	Set<Session> toolContentWebsockets = websockets.get(toolContentId);
+	if (toolContentWebsockets == null) {
+	    return;
+	}
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.put("addTime", timeLimit);
+	String response = responseJSON.toString();
+
+	for (Session websocket : toolContentWebsockets) {
+	    if (websocket.isOpen()) {
+		websocket.getBasicRemote().sendText(response);
+	    }
+	}
+    }
+
+    /**
+     * Monitor has launched time limit. All learners will need to refresh the page in order to stop showing them
+     * waitForTimeLimitLaunch page.
+     */
+    private static void sendPageRefreshRequest(Long toolContentId) throws IOException {
+	Set<Session> toolContentWebsockets = websockets.get(toolContentId);
+	if (toolContentWebsockets == null) {
+	    return;
+	}
+
+	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+	responseJSON.put("pageRefresh", true);
+	String response = responseJSON.toString();
+
+	for (Session websocket : toolContentWebsockets) {
+	    if (websocket.isOpen()) {
+		websocket.getBasicRemote().sendText(response);
+	    }
+	}
+    }
+
+    private static IDokumaranService getDokumaranService() {
+	if (dokumaranService == null) {
+	    WebApplicationContext wac = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(SessionManager.getServletContext());
+	    dokumaranService = (IDokumaranService) wac.getBean(DokumaranConstants.RESOURCE_SERVICE);
+	}
+	return dokumaranService;
+    }
+}
\ No newline at end of file
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
===================================================================
diff -u
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java	(revision 0)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -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 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.dokumaran.web.controller;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
+import org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants;
+import org.lamsfoundation.lams.tool.dokumaran.dto.ReflectDTO;
+import org.lamsfoundation.lams.tool.dokumaran.dto.SessionDTO;
+import org.lamsfoundation.lams.tool.dokumaran.model.Dokumaran;
+import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranConfigItem;
+import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranSession;
+import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranUser;
+import org.lamsfoundation.lams.tool.dokumaran.service.DokumaranConfigurationException;
+import org.lamsfoundation.lams.tool.dokumaran.service.IDokumaranService;
+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.RequestMapping;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+@Controller
+@RequestMapping("/monitoring")
+public class MonitoringController{
+    
+    public static Logger log = Logger.getLogger(MonitoringController.class);
+    
+    @Autowired
+    @Qualifier("dokumaranService")
+    private IDokumaranService dokumaranService;
+
+
+    @RequestMapping("/summary")
+    private String summary(HttpServletRequest request,
+	    HttpServletResponse response) throws DokumaranConfigurationException, URISyntaxException {
+	// initial Session Map
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+	request.setAttribute(DokumaranConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	// save contentFolderID into session
+	sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID,
+		WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID));
+
+	Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	List<SessionDTO> groupList = dokumaranService.getSummary(contentId);
+	boolean hasFaultySession = false;
+	for (SessionDTO group : groupList) {
+	    hasFaultySession |= group.isSessionFaulty();
+	}
+
+	Dokumaran dokumaran = dokumaranService.getDokumaranByContentId(contentId);
+
+	// Create reflectList if reflection is enabled.
+	if (dokumaran.isReflectOnActivity()) {
+	    List<ReflectDTO> relectList = dokumaranService.getReflectList(contentId);
+	    sessionMap.put(DokumaranConstants.ATTR_REFLECT_LIST, relectList);
+	}
+	
+	//time limit
+	boolean isTimeLimitEnabled = dokumaran.getTimeLimit() != 0;
+	long secondsLeft = isTimeLimitEnabled ? dokumaranService.getSecondsLeft(dokumaran) : 0;
+	sessionMap.put(DokumaranConstants.ATTR_SECONDS_LEFT, secondsLeft);
+
+	// cache into sessionMap
+	sessionMap.put(DokumaranConstants.ATTR_SUMMARY_LIST, groupList);
+	sessionMap.put(DokumaranConstants.ATTR_HAS_FAULTY_SESSION, hasFaultySession);
+	sessionMap.put(DokumaranConstants.PAGE_EDITABLE, dokumaran.isContentInUse());
+	sessionMap.put(DokumaranConstants.ATTR_DOKUMARAN, dokumaran);
+	sessionMap.put(DokumaranConstants.ATTR_TOOL_CONTENT_ID, contentId);
+	sessionMap.put(DokumaranConstants.ATTR_IS_GROUPED_ACTIVITY, dokumaranService.isGroupedActivity(contentId));
+	
+	// get the API key from the config table and add it to the session
+	DokumaranConfigItem etherpadServerUrlConfig = dokumaranService.getConfigItem(DokumaranConfigItem.KEY_ETHERPAD_URL);
+	if (etherpadServerUrlConfig == null || etherpadServerUrlConfig.getConfigValue() == null) {
+	    return "pages/learning/notconfigured";
+	}
+	String etherpadServerUrl = etherpadServerUrlConfig.getConfigValue();
+	request.setAttribute(DokumaranConstants.KEY_ETHERPAD_SERVER_URL, etherpadServerUrl);
+	
+	HttpSession ss = SessionManager.getSession();
+	// get back login user DTO
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	
+	//no need to store cookie if there are no sessions created yet
+	if (!groupList.isEmpty()) {
+	    // add new sessionID cookie in order to access pad
+	    Cookie etherpadSessionCookie = dokumaranService.createEtherpadCookieForMonitor(user, contentId);
+	    response.addCookie(etherpadSessionCookie);
+	}
+	
+	return "pages/monitoring/monitoring";
+    }
+    
+    @RequestMapping("/fixFaultySession")
+    private void fixFaultySession(HttpServletRequest request,
+	    HttpServletResponse response) throws DokumaranConfigurationException, ServletException, IOException {
+	Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+	DokumaranSession session = dokumaranService.getDokumaranSessionBySessionId(toolSessionId);
+	
+	try {
+	    log.debug("Fixing faulty session (sessionId=" + toolSessionId + ").");
+	    dokumaranService.createPad(session.getDokumaran(), session);
+
+	} catch (Exception e) {
+	    // printing out error cause
+	    response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+	    response.setContentType("text/html");
+	    PrintWriter out = response.getWriter();
+	    out.write("Failed! " + e.getMessage());
+	    out.flush();
+	    out.close();
+	    log.error("Failed! " + e.getMessage());
+	}
+	
+    }
+    
+    /**
+     * Stores date when user has started activity with time limit
+     * @throws IOException 
+     * @throws JSONException 
+     */
+    @RequestMapping("/launchTimeLimit")
+    private void launchTimeLimit(HttpServletRequest request) throws IOException {
+	Long toolContentId = WebUtil.readLongParam(request, DokumaranConstants.ATTR_TOOL_CONTENT_ID, false);
+	
+	dokumaranService.launchTimeLimit(toolContentId);
+    }
+    
+    /**
+     * Stores date when user has started activity with time limit
+     * @throws IOException 
+     * @throws JSONException 
+     */
+    @RequestMapping("/addOneMinute")
+    private void addOneMinute(HttpServletRequest request) throws IOException {
+	Long toolContentId = WebUtil.readLongParam(request, DokumaranConstants.ATTR_TOOL_CONTENT_ID, false);
+	
+	dokumaranService.addOneMinute(toolContentId);
+
+    }
+
+}
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/AdminForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/AdminForm.java	(.../AdminForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/AdminForm.java	(.../AdminForm.java)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -9,18 +9,12 @@
 /**
  *
  */
-public class AdminForm extends ActionForm {
+public class AdminForm{
     private static final long serialVersionUID = 414425664356226L;
 
     private String etherpadUrl;
     private String apiKey;
 
-    @Override
-    public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
-	ActionErrors ac = new ActionErrors();
-//	ac.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("this is an error"));
-	return ac;
-    }
     
     public String getEtherpadUrl() {
 	return etherpadUrl;
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java	(.../DokumaranForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java	(.../DokumaranForm.java)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -48,6 +48,8 @@
     private int currentTab;
     private FormFile offlineFile;
     private FormFile onlineFile;
+    
+    private String mode;
 
     private Dokumaran dokumaran;
 
@@ -65,9 +67,8 @@
 	}
     }
 
-    @Override
-    public void reset(ActionMapping mapping, HttpServletRequest request) {
-	String param = mapping.getParameter();
+    
+    public void reset(HttpServletRequest request, String param) {
 	// 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")) {
@@ -126,4 +127,12 @@
 	this.contentFolderID = contentFolderID;
     }
 
+    public String getMode() {
+        return mode;
+    }
+
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
+
 }
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/ReflectionForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/ReflectionForm.java	(.../ReflectionForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/ReflectionForm.java	(.../ReflectionForm.java)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -33,7 +33,7 @@
  *
  *
  */
-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_doku/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/spring-servlet.xml	(revision 0)
+++ lams_tool_doku/web/WEB-INF/spring-servlet.xml	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -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.dokumaran.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
Index: lams_tool_doku/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -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_doku/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -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_doku/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -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>
@@ -284,42 +283,42 @@
 					<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">
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							cssClass="form-control form-control-inline">
+						<form: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:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</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">
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							cssClass="form-control form-control-inline">
+						<form: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:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_tool_doku/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -1,5 +1,4 @@
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -42,23 +41,23 @@
 
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowCommentsVariableName}" value="1"
-		styleId="${allowCommentsVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowCommentsVariableName}" value="1"
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<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}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_doku/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -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>
Index: lams_tool_doku/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -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_doku/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -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_doku/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -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_doku/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -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_doku/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -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
Index: lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -212,192 +212,6 @@
 
    </tag>
 
-  	<tag>
-		<name>STRUTS-textarea</name>
-		<tag-class>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tag-class>
-		<body-content>empty</body-content>
-		<attribute>
-			<name>accesskey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>alt</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>altKey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>bundle</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>cols</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>disabled</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorKey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorStyle</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorStyleClass</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>errorStyleId</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>index</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>indexed</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>name</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onblur</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onchange</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onclick</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>ondblclick</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onfocus</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onkeydown</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onkeypress</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onkeyup</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmousedown</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmousemove</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmouseout</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmouseover</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>onmouseup</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>property</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>readonly</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>rows</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>style</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>styleClass</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>styleId</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>tabindex</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>title</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>titleKey</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>value</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-	</tag>
-	
 	<tag>
       <description>Small portrait of a user</description>
       <display-name>User Portrait</display-name>
Index: lams_tool_doku/web/WEB-INF/web.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/WEB-INF/web.xml	(.../web.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/web.xml	(.../web.xml)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -73,25 +73,11 @@
 	</filter-mapping>
 
 	<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>
@@ -122,7 +108,7 @@
 	</servlet>
 
 	<servlet-mapping>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
Index: lams_tool_doku/web/common/messages.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/common/messages.jsp	(.../messages.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/common/messages.jsp	(.../messages.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -1,8 +1,9 @@
 <%-- Error Messages --%>
-<logic:messagesPresent>
-		<lams:Alert id="errorMessages" type="danger" close="false">
-        <html:messages id="error">
-            <c:out value="${error}" escapeXml="false"/><BR/>
-        </html:messages>
-    </lams:Alert>
-</logic:messagesPresent>
+ <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}" /><br /> 
+         </c:forEach> 
+     </lams:Alert> 
+</c:if>
\ No newline at end of file
Index: lams_tool_doku/web/common/taglibs.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -1,11 +1,7 @@
 <%@ 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" %> 
\ No newline at end of file
Index: lams_tool_doku/web/pages/admin/config.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/pages/admin/config.jsp	(.../config.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/admin/config.jsp	(.../config.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -27,29 +27,27 @@
 				</lams:Alert>
 			</c:if>
 			
-			<html:form action="/ladoku11admin" styleId="ladoku11adminForm" method="post" enctype="multipart/form-data">
+			<form:form action="saveContent.do" modelAttribute="ladoku11adminForm" id="ladoku11adminForm" method="post" enctype="multipart/form-data">
 				
-				<html:hidden property="dispatch" value="saveContent" />
-				
 				<div class="form-group voffset5">
 					<label for="etherpadUrl">
 						<fmt:message key="admin.etherpad.url" />
 					</label>
-					<html:text property="etherpadUrl" size="50" maxlength="255" styleClass="form-control form-control-inline"/>
+					<form:input path="etherpadUrl" size="50" maxlength="255" cssClass="form-control form-control-inline"/>
 				</div>
 				
 				<div class="form-group voffset5">
 					<label for="apiKey">
 						<fmt:message key="admin.apiKey" />
 					</label>
-					<html:text property="apiKey" size="50" maxlength="255" styleClass="form-control form-control-inline"/>
+					<form:input path="apiKey" size="50" maxlength="255" cssClass="form-control form-control-inline"/>
 				</div>
 			
-				<html:submit styleClass="btn btn-primary pull-right">
+				<button class="btn btn-primary pull-right">
 					<fmt:message key="label.save"/>
-				</html:submit>
+				</button>
 			
-			</html:form>
+			</form:form>
 			
 			<div id="footer">
 			</div>
Index: lams_tool_doku/web/pages/authoring/advance.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -1,20 +1,19 @@
 <%@ 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.select.leader">
 	<div class="checkbox">
 		<label for="useSelectLeaderToolOuput">
-			<html:checkbox property="dokumaran.useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput"/>
+			<form:checkbox path="dokumaran.useSelectLeaderToolOuput" value="1" id="useSelectLeaderToolOuput"/>
 			<fmt:message key="label.use.select.leader.tool.output" />
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="allowMultipleLeaders">
-			<html:checkbox property="dokumaran.allowMultipleLeaders" value="1" styleId="allowMultipleLeaders"
-				disabled="${!formBean.dokumaran.useSelectLeaderToolOuput}"/>
+			<form:checkbox path="dokumaran.allowMultipleLeaders" value="1" id="allowMultipleLeaders"
+				disabled="${!authoringForm.dokumaran.useSelectLeaderToolOuput}"/>
 			<fmt:message key="label.allow.multiple.leaders" />
 		</label>
 	</div>
@@ -25,34 +24,34 @@
 	<div class="form-inline">
 		<label for="timeLimit">
 			<fmt:message key="label.time.limit" />&nbsp;
-			<html:text property="dokumaran.timeLimit" size="3" styleId="timeLimit" styleClass="form-control input-sm"/>
+			<form:input path="dokumaran.timeLimit" size="3" id="timeLimit" cssClass="form-control input-sm"/>
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="showChat">
-			<html:checkbox property="dokumaran.showChat" styleId="showChat"/>
+			<form:checkbox path="dokumaran.showChat" id="showChat"/>
 			<fmt:message key="label.show.chat" />
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="showLineNumbers">
-			<html:checkbox property="dokumaran.showLineNumbers" styleId="showLineNumbers"/>
+			<form:checkbox path="dokumaran.showLineNumbers" id="showLineNumbers"/>
 			<fmt:message key="label.show.line.numbers" />
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="shared-pad-id-on">
 			<input type="checkbox" id="shared-pad-id-on" 
-				<c:if test="${not empty formBean.dokumaran.sharedPadId}">checked="checked"</c:if>/>
+				<c:if test="${not empty authoringForm.dokumaran.sharedPadId}">checked="checked"</c:if>/>
 			<fmt:message key="label.shared.pad.id" />
 		</label>
 	</div>
 	
 	<div class="form-group">
-		<html:text property="dokumaran.sharedPadId" styleClass="form-control" styleId="shared-pad-id" />
+		<form:input path="dokumaran.sharedPadId" cssClass="form-control" id="shared-pad-id" />
 	</div>
 
 </lams:SimplePanel>
@@ -61,20 +60,20 @@
 
 	<div class="checkbox">
 		<label for="lockWhenFinished">
-			<html:checkbox property="dokumaran.lockWhenFinished" styleId="lockWhenFinished" />
+			<form:checkbox path="dokumaran.lockWhenFinished" id="lockWhenFinished" />
 			<fmt:message key="label.authoring.advance.lock.on.finished" />
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="reflect-on">
-			<html:checkbox property="dokumaran.reflectOnActivity" styleId="reflect-on"/>
+			<form:checkbox path="dokumaran.reflectOnActivity" id="reflect-on"/>
 			<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 		</label>
 	</div>
 	
 	<div class="form-group">
-		<html:textarea property="dokumaran.reflectInstructions" styleClass="form-control" styleId="reflect-instructions" rows="3" />
+		<form:textarea path="dokumaran.reflectInstructions" cssClass="form-control" id="reflect-instructions" rows="3" />
 	</div>
 	
 </lams:SimplePanel>
Index: lams_tool_doku/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -28,13 +28,12 @@
 </lams:head>
 
 <body class="stripes" onLoad="init()">
-<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
-	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-	<html:hidden property="dokumaran.contentId" />
-	<html:hidden property="mode" value="${mode}"/>
-	<html:hidden property="sessionMapID" />
-	<html:hidden property="contentFolderID" />
-	<html:hidden property="currentTab" styleId="currentTab" />
+<form:form action="update.do" modelAttribute="authoringForm" method="post" id="authoringForm" enctype="multipart/form-data">
+	<form:hidden path="dokumaran.contentId" />
+	<form:hidden path="mode" value="${mode}"/>
+	<form:hidden path="sessionMapID" />
+	<form:hidden path="contentFolderID" />
+	<form:hidden path="currentTab" styleId="currentTab" />
 
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	<lams:Page title="${title}" type="navbar">
@@ -66,14 +65,14 @@
 				accessMode="author"
 			--%>
 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
-				toolSignature="<%=DokumaranConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.dokumaran.contentId}" 
-				 customiseSessionID="${formBean.sessionMapID}" accessMode="${mode}" defineLater="${mode=='teacher'}"
-				 contentFolderID="${formBean.contentFolderID}" />
+				toolSignature="<%=DokumaranConstants.TOOL_SIGNATURE%>" toolContentID="${authoringForm.dokumaran.contentId}" 
+				 customiseSessionID="${authoringForm.sessionMapID}" accessMode="${authoringForm.mode}" defineLater="${mode=='teacher'}"
+				 contentFolderID="${authoringForm.contentFolderID}" />
 		</lams:TabBodyArea>
 	
 		<div id="footer"></div>
 
 	</lams:Page>
-</html:form>
+</form:form>
 </body>
 </lams:html>
Index: lams_tool_doku/web/pages/authoring/basic.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -1,17 +1,16 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <!-- Basic Tab Content -->
 <div class="form-group">
     <label for="forum.title">
     	<fmt:message key="label.authoring.basic.title"/>
     </label>
-    <html:text property="dokumaran.title" styleClass="form-control"/>
+    <form:input path="dokumaran.title" cssClass="form-control"/>
 </div>
 
 <div class="form-group">
     <label for="dokumaran.instructions">
     	<fmt:message key="label.authoring.basic.instruction" />
     </label>
-    <lams:CKEditor id="dokumaran.instructions" value="${formBean.dokumaran.instructions}" contentFolderID="${formBean.contentFolderID}" height="400" toolbarSet="DefaultDoku" method="inline"/>
+    <lams:CKEditor id="dokumaran.instructions" value="${authoringForm.dokumaran.instructions}" contentFolderID="${authoringForm.contentFolderID}" height="400" toolbarSet="DefaultDoku" method="inline"/>
 </div>
Index: lams_tool_doku/web/pages/authoring/start.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -3,10 +3,10 @@
 
 <html>
 <body class="stripes">
-	<html:form action="/authoring/init.do?mode=${mode}" method="post" styleId="startForm">
-		<html:hidden property="dokumaran.contentId"/>
-		<html:hidden property="sessionMapID"/>
-	</html:form>
+	<form:form action="init.do?mode=${mode}" modelAttribute="authoringForm" method="post" id="startForm">
+		<form:hidden path="dokumaran.contentId"/>
+		<form:hidden path="sessionMapID"/>
+	</form:form>
 	
 	<script type="text/javascript">
 		document.getElementById("startForm").submit();
Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -38,7 +38,7 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/etherpad.js'/>"></script>
+	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/etherpad.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function(){
 			
@@ -243,9 +243,9 @@
 					</c:choose>
 
 					<c:if test="${mode != 'teacher'}">
-						<html:button property="ContinueButton" onclick="return continueReflect()" styleClass="btn btn-sm btn-default voffset5">
+						<button name="ContinueButton" onclick="return continueReflect()" class="btn btn-sm btn-default voffset5">
 						<fmt:message key="label.edit" />
-						</html:button>
+						</button>
 					</c:if>
 				</div>
 			</div>
@@ -256,14 +256,14 @@
 			<div>
 				<c:choose>
 					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-						<html:button property="FinishButton" styleId="finish-button"
-								onclick="return continueReflect()" styleClass="btn btn-default voffset5 pull-right">
+						<button name="FinishButton" id="finish-button"
+								onclick="return continueReflect()" class="btn btn-default voffset5 pull-right">
 							<fmt:message key="label.continue" />
-						</html:button>
+						</button>
 					</c:when>
 					<c:otherwise>
-						<html:link href="#nogo" property="FinishButton" styleId="finish-button"
-								onclick="return finishSession()" styleClass="btn btn-primary voffset5 pull-right na">
+						<a href="#nogo" name="FinishButton" id="finish-button"
+								onclick="return finishSession()" class="btn btn-primary voffset5 pull-right na">
 							<span class="nextActivity">
 								<c:choose>
 				 					<c:when test="${sessionMap.activityPosition.last}">
@@ -274,7 +274,7 @@
 				 					</c:otherwise>
 				 				</c:choose>
 							</span>
-						</html:link>
+						</a>
 					</c:otherwise>
 				</c:choose>
 			</div>
Index: lams_tool_doku/web/pages/learning/notebook.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -25,9 +25,9 @@
 
 	<lams:Page type="learner" title="${sessionMap.title}">
 	
-	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="reflectionForm">
-		<html:hidden property="userID" />
-		<html:hidden property="sessionMapID" />
+	<form:form action="submitReflection.do" modelAttribute="reflectionForm" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+		<form:hidden path="userID" />
+		<form:hidden path="sessionMapID" />
 
 		<div id="content">
 			<%@ include file="/common/messages.jsp"%>
@@ -36,11 +36,11 @@
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 			</p>
 
-			<html:textarea cols="60" rows="8" property="entryText"
-				styleClass="text-area" />
+			<form:textarea cols="60" rows="8" path="entryText"
+				cssClass="text-area" />
 
 			<div class="space-bottom-top align-right">
-				<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')">
 					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${sessionMap.activityPosition.last}">
@@ -51,10 +51,10 @@
 		 					</c:otherwise>
 		 				</c:choose>
 		 			</span>
-				</html:link>
+				</a>
 			</div>
 		</div>
-	</html:form>
+	</form:form>
 
 	<div id="footer">
 	</div>
Index: lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp	(.../waitForTimeLimitLaunch.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp	(.../waitForTimeLimitLaunch.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -73,9 +73,9 @@
 		</lams:Alert>
 
 		<div class="voffset10">
-			<html:button property="refreshButton" onclick="refresh();" styleClass="btn btn-sm btn-default pull-right">
+			<button name="refreshButton" onclick="refresh();" class="btn btn-sm btn-default pull-right">
 				<fmt:message key="label.refresh" />
-			</html:button>
+			</button>
 		</div>
 
 		<div id="footer"></div>
Index: lams_tool_doku/web/pages/learning/waitforleader.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -39,9 +39,9 @@
 		</div>
 
 		<div class="voffset10">
-			<html:button property="refreshButton" onclick="refresh();" styleClass="btn btn-sm btn-default pull-right">
+			<button name="refreshButton" onclick="refresh();" class="btn btn-sm btn-default pull-right">
 				<fmt:message key="label.refresh" />
-			</html:button>
+			</button>
 		</div>
 
 		<div id="footer"></div>
Index: lams_tool_doku/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -33,9 +33,9 @@
 				<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>
 		</td>
 	</tr>
 </table>
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1cef918442124e8d987a285095a7504e3bc00461
--- lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
@@ -52,7 +52,7 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.jgrowl.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/etherpad.js'/>"></script>
+<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/etherpad.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
 	var isCountdownStarted = ${not empty dokumaran.timeLimitLaunchedDate};