Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java =================================================================== diff -u -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c -r578183182c3aa8d836f7c4ff61886137fb71bcf2 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision 578183182c3aa8d836f7c4ff61886137fb71bcf2) @@ -125,7 +125,7 @@ return (DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG).format(date)); } - public static void persistTimeZone(HttpServletRequest request) + public static void persistInSessionTimeZone(HttpServletRequest request) { TimeZone timeZone=TimeZone.getDefault(); logger.debug("current timezone: " + timeZone.getDisplayName()); @@ -235,7 +235,7 @@ } - public static void persistRichText(HttpServletRequest request) + public static void persistInSessionRichText(HttpServletRequest request) { logger.debug("doing persistRichText: "); String richTextTitle = request.getParameter(TITLE); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java =================================================================== diff -u -raf90794d49a9d2472e1028caeda057963a382c60 -r578183182c3aa8d836f7c4ff61886137fb71bcf2 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java (.../VoteAction.java) (revision af90794d49a9d2472e1028caeda057963a382c60) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java (.../VoteAction.java) (revision 578183182c3aa8d836f7c4ff61886137fb71bcf2) @@ -117,7 +117,7 @@ VoteUtils.cleanUpUserExceptions(request); VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form; IVoteService voteService =VoteUtils.getToolService(request); - VoteUtils.persistRichText(request); + VoteUtils.persistInSessionRichText(request); voteAuthoringForm.resetUserAction(); return null; } @@ -136,7 +136,7 @@ String richTextTitle = request.getParameter("title"); String richTextInstructions = request.getParameter("instructions"); - VoteUtils.persistRichText(request); + VoteUtils.persistInSessionRichText(request); authoringUtil.reconstructOptionContentMapForAdd(mapOptionsContent, request); @@ -219,7 +219,7 @@ logger.debug("voteAuthoringForm :" +voteAuthoringForm); voteAuthoringForm.setSubmissionAttempt(new Boolean(false).toString()); - VoteUtils.persistRichText(request); + VoteUtils.persistInSessionRichText(request); AuthoringUtil authoringUtil= new AuthoringUtil(); Map mapOptionsContent=(Map)request.getSession().getAttribute(MAP_OPTIONS_CONTENT); @@ -329,7 +329,7 @@ } } - VoteUtils.persistRichText(request); + VoteUtils.persistInSessionRichText(request); ActionMessages errors= new ActionMessages(); errors=validateSubmit(request, errors, voteAuthoringForm); @@ -498,7 +498,7 @@ IVoteService voteService =VoteUtils.getToolService(request); - VoteUtils.persistRichText(request); + VoteUtils.persistInSessionRichText(request); Map mapOptionsContent=AuthoringUtil.repopulateMap(request, "optionContent"); logger.debug("mapOptionsContent before move down: " + mapOptionsContent); @@ -619,7 +619,7 @@ String destination=VoteUtils.getDestination(sourceVoteStarter); logger.debug("destination: " + destination); - VoteUtils.persistRichText(request); + VoteUtils.persistInSessionRichText(request); Map mapOptionsContent=AuthoringUtil.repopulateMap(request, "optionContent"); logger.debug("mapOptionsContent before move down: " + mapOptionsContent); @@ -777,7 +777,7 @@ String destination=VoteUtils.getDestination(sourceVoteStarter); logger.debug("destination: " + destination); - VoteUtils.persistRichText(request); + VoteUtils.persistInSessionRichText(request); logger.debug("will uploadFile for offline file:"); VoteAttachmentDTO voteAttachmentDTO=AuthoringUtil.uploadFile(request, voteAuthoringForm, true); @@ -791,7 +791,7 @@ errors.add(Globals.ERROR_KEY,new ActionMessage("error.fileName.empty")); saveErrors(request,errors); voteAuthoringForm.resetUserAction(); - persistError(request,"error.fileName.empty"); + persistInRequestError(request,"error.fileName.empty"); return (mapping.findForward(destination)); } @@ -840,7 +840,7 @@ String destination=VoteUtils.getDestination(sourceVoteStarter); logger.debug("destination: " + destination); - VoteUtils.persistRichText(request); + VoteUtils.persistInSessionRichText(request); logger.debug("will uploadFile for online file:"); VoteAttachmentDTO voteAttachmentDTO=AuthoringUtil.uploadFile(request, voteAuthoringForm, false); @@ -854,7 +854,7 @@ errors.add(Globals.ERROR_KEY,new ActionMessage("error.fileName.empty")); saveErrors(request,errors); voteAuthoringForm.resetUserAction(); - persistError(request,"error.fileName.empty"); + persistInRequestError(request,"error.fileName.empty"); return (mapping.findForward(destination)); } @@ -902,7 +902,7 @@ String destination=VoteUtils.getDestination(sourceVoteStarter); logger.debug("destination: " + destination); - VoteUtils.persistRichText(request); + VoteUtils.persistInSessionRichText(request); String uuid =voteAuthoringForm.getUuid(); logger.debug("uuid:" + uuid); @@ -950,7 +950,7 @@ String destination=VoteUtils.getDestination(sourceVoteStarter); logger.debug("destination: " + destination); - VoteUtils.persistRichText(request); + VoteUtils.persistInSessionRichText(request); String uuid =voteAuthoringForm.getUuid(); logger.debug("uuid:" + uuid); @@ -1026,7 +1026,7 @@ if (isContentInUse == true) { logger.debug("monitoring url does not allow editActivity since the content is in use."); - persistError(request,"error.content.inUse"); + persistInRequestError(request,"error.content.inUse"); request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(true).toString()); } @@ -1046,7 +1046,7 @@ * @param request * @param message */ - public void persistError(HttpServletRequest request, String message) + public void persistInRequestError(HttpServletRequest request, String message) { ActionMessages errors= new ActionMessages(); errors.add(Globals.ERROR_KEY, new ActionMessage(message)); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java =================================================================== diff -u -rd9641f5d7a8cc008eb7621e6a48d6d21438eafe1 -r578183182c3aa8d836f7c4ff61886137fb71bcf2 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision d9641f5d7a8cc008eb7621e6a48d6d21438eafe1) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 578183182c3aa8d836f7c4ff61886137fb71bcf2) @@ -119,7 +119,7 @@ voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); IVoteService voteService =VoteUtils.getToolService(request); - VoteUtils.persistRichText(request); + VoteUtils.persistInSessionRichText(request); voteAuthoringForm.resetUserAction(); return null; } @@ -325,7 +325,7 @@ if (castVoteCount > intMaxNominationCount ) { voteLearningForm.setMaxNominationCountReached(new Boolean(true).toString()); - persistError(request, "error.maxNominationCount.reached"); + persistInRequestError(request, "error.maxNominationCount.reached"); logger.debug("give warning, max nom count reached..."); logger.debug("fwd'ing to: " + LOAD_LEARNER); return (mapping.findForward(LOAD_LEARNER)); @@ -514,7 +514,7 @@ * @param request * @param message */ - public void persistError(HttpServletRequest request, String message) + public void persistInRequestError(HttpServletRequest request, String message) { ActionMessages errors= new ActionMessages(); errors.add(Globals.ERROR_KEY, new ActionMessage(message)); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java =================================================================== diff -u -rd9641f5d7a8cc008eb7621e6a48d6d21438eafe1 -r578183182c3aa8d836f7c4ff61886137fb71bcf2 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision d9641f5d7a8cc008eb7621e6a48d6d21438eafe1) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision 578183182c3aa8d836f7c4ff61886137fb71bcf2) @@ -139,7 +139,7 @@ /* * persist time zone information to session scope. */ - VoteUtils.persistTimeZone(request); + VoteUtils.persistInSessionTimeZone(request); ActionForward validateParameters=validateParameters(request, mapping); logger.debug("validateParameters: " + validateParameters); if (validateParameters != null) @@ -150,55 +150,6 @@ Long toolSessionID=(Long) request.getSession().getAttribute(AttributeNames.PARAM_TOOL_SESSION_ID); logger.debug("retrieved toolSessionID: " + toolSessionID); - /* API test code from here*/ - String createToolSession=request.getParameter("createToolSession"); - logger.debug("createToolSession: " + createToolSession); - if ((createToolSession != null) && createToolSession.equals("1")) - { try - { - voteService.createToolSession(toolSessionID, "toolSessionName", new Long(9876)); - return (mapping.findForward(LEARNING_STARTER)); - } - catch(ToolException e) - { - VoteUtils.cleanUpSessionAbsolute(request); - logger.debug("tool exception" + e); - } - } - - String removeToolSession=request.getParameter("removeToolSession"); - logger.debug("removeToolSession: " + removeToolSession); - if ((removeToolSession != null) && removeToolSession.equals("1")) - { try - { - voteService.removeToolSession(toolSessionID); - return (mapping.findForward(LEARNING_STARTER)); - } - catch(ToolException e) - { - VoteUtils.cleanUpSessionAbsolute(request); - logger.debug("tool exception" + e); - } - } - - String learnerId=request.getParameter("learnerId"); - logger.debug("learnerId: " + learnerId); - if (learnerId != null) - { try - { - String nextUrl=voteService.leaveToolSession(toolSessionID, new Long(learnerId)); - logger.debug("nextUrl: "+ nextUrl); - return (mapping.findForward(LEARNING_STARTER)); - } - catch(ToolException e) - { - VoteUtils.cleanUpSessionAbsolute(request); - logger.debug("tool exception" + e); - } - } - /*till here*/ - - /* * by now, we made sure that the passed tool session id exists in the db as a new record * Make sure we can retrieve it and the relavent content @@ -226,7 +177,7 @@ { VoteUtils.cleanUpSessionAbsolute(request); logger.debug("error: The tool expects voteContent."); - persistError(request,"error.content.doesNotExist"); + persistInRequestError(request,"error.content.doesNotExist"); request.getSession().setAttribute(USER_EXCEPTION_CONTENT_DOESNOTEXIST, new Boolean(true).toString()); return (mapping.findForward(ERROR_LIST)); } @@ -305,7 +256,7 @@ logger.debug("warning to learner: the activity is offline."); request.getSession().setAttribute(USER_EXCEPTION_CONTENT_RUNOFFLINE, new Boolean(true).toString()); voteLearningForm.setActivityRunOffline(new Boolean(true).toString()); - persistError(request,"label.learning.runOffline"); + persistInRequestError(request,"label.learning.runOffline"); return (mapping.findForward(ERROR_LIST)); } @@ -317,7 +268,7 @@ VoteUtils.cleanUpSessionAbsolute(request); request.getSession().setAttribute(USER_EXCEPTION_CONTENT_DEFINE_LATER, new Boolean(true).toString()); logger.debug("warning to learner: the activity is defineLater, we interpret that the content is being modified."); - persistError(request,"error.defineLater"); + persistInRequestError(request,"error.defineLater"); return (mapping.findForward(ERROR_LIST)); } @@ -538,7 +489,7 @@ { VoteUtils.cleanUpSessionAbsolute(request); request.getSession().setAttribute(USER_EXCEPTION_TOOLSESSIONID_REQUIRED, new Boolean(true).toString()); - persistError(request, "error.toolSessionId.required"); + persistInRequestError(request, "error.toolSessionId.required"); return (mapping.findForward(ERROR_LIST)); } else @@ -553,7 +504,7 @@ { VoteUtils.cleanUpSessionAbsolute(request); request.getSession().setAttribute(USER_EXCEPTION_NUMBERFORMAT, new Boolean(true).toString()); - persistError(request, "error.sessionId.numberFormatException"); + persistInRequestError(request, "error.sessionId.numberFormatException"); logger.debug("add error.sessionId.numberFormatException to ActionMessages."); return (mapping.findForward(ERROR_LIST)); } @@ -602,7 +553,7 @@ * @param request * @param message */ - public void persistError(HttpServletRequest request, String message) + public void persistInRequestError(HttpServletRequest request, String message) { ActionMessages errors= new ActionMessages(); errors.add(Globals.ERROR_KEY, new ActionMessage(message)); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java =================================================================== diff -u -r73ed8a0a0d5fa96ffce05fb414831b759b9c000c -r578183182c3aa8d836f7c4ff61886137fb71bcf2 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 73ed8a0a0d5fa96ffce05fb414831b759b9c000c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 578183182c3aa8d836f7c4ff61886137fb71bcf2) @@ -34,12 +34,9 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.apache.struts.Globals; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.vote.VoteAppConstants; import org.lamsfoundation.lams.tool.vote.VoteApplicationException; @@ -1055,19 +1052,5 @@ return (mapping.findForward(VOTE_NOMINATION_VIEWER)); } - - - /** - * persists error messages to request scope - * @param request - * @param message - */ - public void persistError(HttpServletRequest request, String message) - { - ActionMessages errors= new ActionMessages(); - errors.add(Globals.ERROR_KEY, new ActionMessage(message)); - logger.debug("add " + message +" to ActionMessages:"); - saveErrors(request,errors); - } } \ No newline at end of file Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java =================================================================== diff -u -r796f0357fbc2197eb4fda5397cc0c01c6de41d0d -r578183182c3aa8d836f7c4ff61886137fb71bcf2 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 796f0357fbc2197eb4fda5397cc0c01c6de41d0d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 578183182c3aa8d836f7c4ff61886137fb71bcf2) @@ -144,7 +144,7 @@ request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(false).toString()); request.getSession().setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true).toString()); - VoteUtils.persistTimeZone(request); + VoteUtils.persistInSessionTimeZone(request); /* we have made sure TOOL_CONTENT_ID is passed */ Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); @@ -157,7 +157,7 @@ { VoteUtils.cleanUpSessionAbsolute(request); request.getSession().setAttribute(USER_EXCEPTION_CONTENT_DOESNOTEXIST, new Boolean(true).toString()); - persistError(request, "error.content.doesNotExist"); + persistInRequestError(request, "error.content.doesNotExist"); return false; } @@ -170,7 +170,7 @@ if (isContentInUse == true) { logger.debug("monitoring url does not allow editActivity since the content is in use."); - persistError(request,"error.content.inUse"); + persistInRequestError(request,"error.content.inUse"); request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(true).toString()); } @@ -263,7 +263,7 @@ if ((strToolContentId == null) || (strToolContentId.length() == 0)) { - persistError(request, "error.contentId.required"); + persistInRequestError(request, "error.contentId.required"); VoteUtils.cleanUpSessionAbsolute(request); return (mapping.findForward(ERROR_LIST)); } @@ -277,7 +277,7 @@ } catch(NumberFormatException e) { - persistError(request, "error.numberFormatException"); + persistInRequestError(request, "error.numberFormatException"); logger.debug("add error.numberFormatException to ActionMessages."); VoteUtils.cleanUpSessionAbsolute(request); return (mapping.findForward(ERROR_LIST)); @@ -292,7 +292,7 @@ * @param request * @param message */ - public void persistError(HttpServletRequest request, String message) + public void persistInRequestError(HttpServletRequest request, String message) { ActionMessages errors= new ActionMessages(); errors.add(Globals.ERROR_KEY, new ActionMessage(message)); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java =================================================================== diff -u -r0f6c8333c4187ad33fafc3fc874525e091be8d21 -r578183182c3aa8d836f7c4ff61886137fb71bcf2 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java (.../VoteStarterAction.java) (revision 0f6c8333c4187ad33fafc3fc874525e091be8d21) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java (.../VoteStarterAction.java) (revision 578183182c3aa8d836f7c4ff61886137fb71bcf2) @@ -201,7 +201,7 @@ { VoteUtils.cleanUpSessionAbsolute(request); request.getSession().setAttribute(USER_EXCEPTION_CONTENTID_REQUIRED, new Boolean(true).toString()); - persistError(request,"error.contentId.required"); + persistInRequestError(request,"error.contentId.required"); VoteUtils.cleanUpSessionAbsolute(request); logger.debug("forwarding to: " + ERROR_LIST); return (mapping.findForward(ERROR_LIST)); @@ -220,7 +220,7 @@ { VoteUtils.cleanUpSessionAbsolute(request); request.getSession().setAttribute(USER_EXCEPTION_NUMBERFORMAT, new Boolean(true).toString()); - persistError(request,"error.numberFormatException"); + persistInRequestError(request,"error.numberFormatException"); logger.debug("forwarding to: " + ERROR_LIST); return (mapping.findForward(ERROR_LIST)); } @@ -350,7 +350,7 @@ VoteUtils.cleanUpSessionAbsolute(request); logger.debug("student activity occurred on this content:" + voteContent); request.getSession().setAttribute(USER_EXCEPTION_CONTENT_IN_USE, new Boolean(true).toString()); - persistError(request, "error.content.inUse"); + persistInRequestError(request, "error.content.inUse"); return (mapping.findForward(ERROR_LIST)); } @@ -363,7 +363,7 @@ VoteUtils.cleanUpSessionAbsolute(request); logger.debug("student activity occurred on this content:" + voteContent); request.getSession().setAttribute(USER_EXCEPTION_CONTENT_IN_USE, new Boolean(true).toString()); - persistError(request, "error.content.inUse"); + persistInRequestError(request, "error.content.inUse"); return (mapping.findForward(ERROR_LIST)); } @@ -442,7 +442,7 @@ { VoteUtils.cleanUpSessionAbsolute(request); logger.debug("default content id has not been setup"); - persistError(request,"error.defaultContent.notSetup"); + persistInRequestError(request,"error.defaultContent.notSetup"); request.getSession().setAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP, new Boolean(true).toString()); return (mapping.findForward(ERROR_LIST)); } @@ -451,7 +451,7 @@ { VoteUtils.cleanUpSessionAbsolute(request); logger.debug("error getting the default content id: " + e.getMessage()); - persistError(request,"error.defaultContent.notSetup"); + persistInRequestError(request,"error.defaultContent.notSetup"); request.getSession().setAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP, new Boolean(true).toString()); logger.debug("forwarding to: " + ERROR_LIST); return (mapping.findForward(ERROR_LIST)); @@ -470,7 +470,7 @@ logger.debug("voteContent is null: " + voteContent); VoteUtils.cleanUpSessionAbsolute(request); logger.debug("Exception occured: No default content"); - persistError(request,"error.defaultContent.notSetup"); + persistInRequestError(request,"error.defaultContent.notSetup"); request.getSession().setAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP, new Boolean(true).toString()); return (mapping.findForward(ERROR_LIST)); } @@ -484,7 +484,7 @@ logger.debug("other problems: " + e); VoteUtils.cleanUpSessionAbsolute(request); logger.debug("Exception occured: No default question content"); - persistError(request,"error.defaultContent.notSetup"); + persistInRequestError(request,"error.defaultContent.notSetup"); request.getSession().setAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP, new Boolean(true).toString()); logger.debug("forwarding to: " + ERROR_LIST); return (mapping.findForward(ERROR_LIST)); @@ -652,7 +652,7 @@ * @param request * @param message */ - public void persistError(HttpServletRequest request, String message) + public void persistInRequestError(HttpServletRequest request, String message) { ActionMessages errors= new ActionMessages(); errors.add(Globals.ERROR_KEY, new ActionMessage(message));