Index: lams_tool_doku/.classpath =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r58e32af997a2da8fc96806124b29fc68fdefb149 --- lams_tool_doku/.classpath (.../.classpath) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/.classpath (.../.classpath) (revision 58e32af997a2da8fc96806124b29fc68fdefb149) @@ -2,7 +2,6 @@ - @@ -29,5 +28,6 @@ + Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java =================================================================== diff -u -r1cef918442124e8d987a285095a7504e3bc00461 -r58e32af997a2da8fc96806124b29fc68fdefb149 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 1cef918442124e8d987a285095a7504e3bc00461) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 58e32af997a2da8fc96806124b29fc68fdefb149) @@ -21,13 +21,11 @@ * **************************************************************** */ - 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; @@ -37,20 +35,12 @@ 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; @@ -62,25 +52,22 @@ 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 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 { + private String summary(HttpServletRequest request, HttpServletResponse response) + throws DokumaranConfigurationException, URISyntaxException { // initial Session Map - SessionMap sessionMap = new SessionMap(); + SessionMap sessionMap = new SessionMap<>(); request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); request.setAttribute(DokumaranConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); // save contentFolderID into session @@ -101,7 +88,7 @@ List 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; @@ -114,35 +101,36 @@ 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); + 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 { + 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); @@ -157,30 +145,32 @@ out.close(); log.error("Failed! " + e.getMessage()); } - + } - + /** * Stores date when user has started activity with time limit - * @throws IOException - * @throws JSONException + * + * @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 + * + * @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 -r1cef918442124e8d987a285095a7504e3bc00461 -r58e32af997a2da8fc96806124b29fc68fdefb149 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/AdminForm.java (.../AdminForm.java) (revision 1cef918442124e8d987a285095a7504e3bc00461) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/AdminForm.java (.../AdminForm.java) (revision 58e32af997a2da8fc96806124b29fc68fdefb149) @@ -1,21 +1,14 @@ package org.lamsfoundation.lams.tool.dokumaran.web.form; -import javax.servlet.http.HttpServletRequest; - -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionMapping; - /** * */ -public class AdminForm{ +public class AdminForm { private static final long serialVersionUID = 414425664356226L; private String etherpadUrl; private String apiKey; - public String getEtherpadUrl() { return etherpadUrl; } Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java =================================================================== diff -u -r1cef918442124e8d987a285095a7504e3bc00461 -r58e32af997a2da8fc96806124b29fc68fdefb149 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java (.../DokumaranForm.java) (revision 1cef918442124e8d987a285095a7504e3bc00461) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java (.../DokumaranForm.java) (revision 58e32af997a2da8fc96806124b29fc68fdefb149) @@ -27,17 +27,14 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.tool.dokumaran.model.Dokumaran; /** * Dokumaran Form. * * User: Dapeng.Ni */ -public class DokumaranForm extends ActionForm { +public class DokumaranForm { private static final long serialVersionUID = 3599879328307492312L; private static Logger logger = Logger.getLogger(DokumaranForm.class.getName()); @@ -46,9 +43,9 @@ private String sessionMapID; private String contentFolderID; private int currentTab; - private FormFile offlineFile; - private FormFile onlineFile; - + private String offlineFile; + private String onlineFile; + private String mode; private Dokumaran dokumaran; @@ -67,7 +64,6 @@ } } - 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! @@ -91,19 +87,19 @@ this.currentTab = currentTab; } - public FormFile getOfflineFile() { + public String getOfflineFile() { return offlineFile; } - public void setOfflineFile(FormFile offlineFile) { + public void setOfflineFile(String offlineFile) { this.offlineFile = offlineFile; } - public FormFile getOnlineFile() { + public String getOnlineFile() { return onlineFile; } - public void setOnlineFile(FormFile onlineFile) { + public void setOnlineFile(String onlineFile) { this.onlineFile = onlineFile; } @@ -128,11 +124,11 @@ } public String getMode() { - return mode; + return mode; } public void setMode(String mode) { - this.mode = mode; + this.mode = mode; } } Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/ReflectionForm.java =================================================================== diff -u -r1cef918442124e8d987a285095a7504e3bc00461 -r58e32af997a2da8fc96806124b29fc68fdefb149 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/ReflectionForm.java (.../ReflectionForm.java) (revision 1cef918442124e8d987a285095a7504e3bc00461) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/ReflectionForm.java (.../ReflectionForm.java) (revision 58e32af997a2da8fc96806124b29fc68fdefb149) @@ -21,19 +21,17 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.dokumaran.web.form; import org.apache.log4j.Logger; -import org.apache.struts.validator.ValidatorForm; /** * * Reflection Form. * * */ -public class ReflectionForm{ +public class ReflectionForm { private static final long serialVersionUID = -9054365604649146735L; private static Logger logger = Logger.getLogger(ReflectionForm.class.getName()); Fisheye: Tag 58e32af997a2da8fc96806124b29fc68fdefb149 refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/struts-config.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 58e32af997a2da8fc96806124b29fc68fdefb149 refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/tlds/struts/struts-bean-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 58e32af997a2da8fc96806124b29fc68fdefb149 refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/tlds/struts/struts-bean.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 58e32af997a2da8fc96806124b29fc68fdefb149 refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/tlds/struts/struts-html-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 58e32af997a2da8fc96806124b29fc68fdefb149 refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/tlds/struts/struts-html.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 58e32af997a2da8fc96806124b29fc68fdefb149 refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/tlds/struts/struts-logic-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 58e32af997a2da8fc96806124b29fc68fdefb149 refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/tlds/struts/struts-logic.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 58e32af997a2da8fc96806124b29fc68fdefb149 refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/tlds/struts/struts-nested.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 58e32af997a2da8fc96806124b29fc68fdefb149 refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/tlds/struts/struts-tiles-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 58e32af997a2da8fc96806124b29fc68fdefb149 refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/tlds/struts/struts-tiles.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 58e32af997a2da8fc96806124b29fc68fdefb149 refers to a dead (removed) revision in file `lams_tool_doku/web/WEB-INF/validation.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_doku/web/WEB-INF/web.xml =================================================================== diff -u -r1cef918442124e8d987a285095a7504e3bc00461 -r58e32af997a2da8fc96806124b29fc68fdefb149 --- lams_tool_doku/web/WEB-INF/web.xml (.../web.xml) (revision 1cef918442124e8d987a285095a7504e3bc00461) +++ lams_tool_doku/web/WEB-INF/web.xml (.../web.xml) (revision 58e32af997a2da8fc96806124b29fc68fdefb149) @@ -124,42 +124,6 @@ - - - - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld - - - tags-html - /WEB-INF/tlds/struts/struts-html.tld - - - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld - - - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld - - - - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld - - - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld - - - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld - - - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld - - Index: lams_tool_doku/web/pages/admin/config.jsp =================================================================== diff -u -r1cef918442124e8d987a285095a7504e3bc00461 -r58e32af997a2da8fc96806124b29fc68fdefb149 --- lams_tool_doku/web/pages/admin/config.jsp (.../config.jsp) (revision 1cef918442124e8d987a285095a7504e3bc00461) +++ lams_tool_doku/web/pages/admin/config.jsp (.../config.jsp) (revision 58e32af997a2da8fc96806124b29fc68fdefb149) @@ -27,7 +27,7 @@ - +