Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java =================================================================== diff -u -r6c622fc902f451ad79501061202fc107c7771133 -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java (.../LearningDesignRepositoryServlet.java) (revision 6c622fc902f451ad79501061202fc107c7771133) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java (.../LearningDesignRepositoryServlet.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) @@ -353,8 +353,8 @@ log.error("can not authenticate", e); response.sendError(response.SC_BAD_REQUEST, "can not authenticate"); } catch (UserInfoFetchException e) { - log.error("can not retreive user information", e); - response.sendError(response.SC_BAD_REQUEST, "can not retreive user information"); + log.error("can not retrieve user information", e); + response.sendError(response.SC_BAD_REQUEST, "can not retrieve user information"); } catch (UserAccessDeniedException e) { log.error("user access denied", e); response.sendError(response.SC_BAD_REQUEST, "user access denied"); Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java =================================================================== diff -u -r9f7df51118e418eead64378c028572b0baf39196 -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java (.../LearningAction.java) (revision 9f7df51118e418eead64378c028572b0baf39196) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java (.../LearningAction.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) @@ -93,7 +93,7 @@ // Retrieve the session and content. ChatSession chatSession = chatService.getSessionBySessionId(toolSessionID); if (chatSession == null) { - throw new ChatException("Cannot retreive session with toolSessionID" + toolSessionID); + throw new ChatException("Cannot retrieve session with toolSessionID" + toolSessionID); } Chat chat = chatSession.getChat(); Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java =================================================================== diff -u -rcd91e8c512cb9f4e299672e839e5a949cfe349df -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java (.../LearningAction.java) (revision cd91e8c512cb9f4e299672e839e5a949cfe349df) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java (.../LearningAction.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) @@ -96,12 +96,12 @@ // Retrieve the session and content. GmapSession gmapSession = gmapService.getSessionBySessionId(toolSessionID); if (gmapSession == null) { - throw new GmapException("Cannot retreive session with toolSessionID"+ toolSessionID); + throw new GmapException("Cannot retrieve session with toolSessionID"+ toolSessionID); } Gmap gmap = gmapSession.getGmap(); if (gmap.getTitle() == null) { - throw new GmapException("Cannot retreive gmap with toolSessionID"+ toolSessionID); + throw new GmapException("Cannot retrieve gmap with toolSessionID"+ toolSessionID); } @@ -215,7 +215,7 @@ // Retrieve the session and content. GmapSession gmapSession = gmapService.getSessionBySessionId(toolSessionID); if (gmapSession == null) { - throw new GmapException("Cannot retreive session with toolSessionID"+ toolSessionID); + throw new GmapException("Cannot retrieve session with toolSessionID"+ toolSessionID); } // update the marker list @@ -273,7 +273,7 @@ // Retrieve the session and content. GmapSession gmapSession = gmapService.getSessionBySessionId(toolSessionID); if (gmapSession == null) { - throw new GmapException("Cannot retreive session with toolSessionID"+ toolSessionID); + throw new GmapException("Cannot retrieve session with toolSessionID"+ toolSessionID); } // update the marker list Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java =================================================================== diff -u -r714b9e7b785b4cc6b7a37e56938c0858f74138a5 -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 714b9e7b785b4cc6b7a37e56938c0858f74138a5) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) @@ -159,7 +159,7 @@ // Retrieve the session and content. GmapSession gmapSession = gmapService.getSessionBySessionId(toolSessionID); if (gmapSession == null) { - throw new GmapException("Cannot retreive session with toolSessionID" + toolSessionID); + throw new GmapException("Cannot retrieve session with toolSessionID" + toolSessionID); } // update the marker list Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java =================================================================== diff -u -r79d80d58b415dfbead2011e4f1701a338b613b11 -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java (.../LearningAction.java) (revision 79d80d58b415dfbead2011e4f1701a338b613b11) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java (.../LearningAction.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) @@ -117,7 +117,7 @@ // Retrieve the session and content. MindmapSession mindmapSession = mindmapService.getSessionBySessionId(toolSessionID); if (mindmapSession == null) { - throw new MindmapException("Cannot retreive session with toolSessionID: " + toolSessionID); + throw new MindmapException("Cannot retrieve session with toolSessionID: " + toolSessionID); } Mindmap mindmap = mindmapSession.getMindmap(); @@ -810,7 +810,7 @@ // Retrieve the session and content MindmapSession mindmapSession = mindmapService.getSessionBySessionId(toolSessionID); if (mindmapSession == null) - throw new MindmapException("Cannot retreive session with toolSessionID" + toolSessionID); + throw new MindmapException("Cannot retrieve session with toolSessionID" + toolSessionID); Mindmap mindmap = mindmapSession.getMindmap(); Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java =================================================================== diff -u -r2c2e9dc9833eff48165e8b5e830d399d546c60df -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java (.../LearningAction.java) (revision 2c2e9dc9833eff48165e8b5e830d399d546c60df) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java (.../LearningAction.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) @@ -102,7 +102,7 @@ .getSessionBySessionId(toolSessionID); if (notebookSession == null) { throw new NotebookException( - "Cannot retreive session with toolSessionID" + "Cannot retrieve session with toolSessionID" + toolSessionID); } Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java =================================================================== diff -u -r067810312ad3acd85b3707cd08a7e11f6ec30baf -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java (.../LearningAction.java) (revision 067810312ad3acd85b3707cd08a7e11f6ec30baf) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java (.../LearningAction.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) @@ -120,7 +120,7 @@ // Retrieve the session and content. PixlrSession pixlrSession = pixlrService.getSessionBySessionId(toolSessionID); if (pixlrSession == null) { - throw new PixlrException("Cannot retreive session with toolSessionID" + toolSessionID); + throw new PixlrException("Cannot retrieve session with toolSessionID" + toolSessionID); } Pixlr pixlr = pixlrSession.getPixlr(); @@ -414,7 +414,7 @@ // Retrieve the session and content. PixlrSession pixlrSession = pixlrService.getSessionBySessionId(toolSessionID); if (pixlrSession == null) { - throw new PixlrException("Cannot retreive session with toolSessionID" + toolSessionID); + throw new PixlrException("Cannot retrieve session with toolSessionID" + toolSessionID); } Pixlr pixlr = pixlrSession.getPixlr(); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java =================================================================== diff -u -reab46de044a4c899fb8c8759c375402c6dba8783 -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision eab46de044a4c899fb8c8759c375402c6dba8783) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) @@ -421,7 +421,7 @@ dto.setLimitUploadLeft(limitUploadLeft); } - // retreive notebook reflection entry. + // retrieve notebook reflection entry. ISubmitFilesService submitFilesService = getService(); NotebookEntry notebookEntry = submitFilesService.getEntry((Long) sessionMap Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java =================================================================== diff -u -r1bddf2af8d3cd3191a23d54a718bd3f313cb1aea -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java (.../LearningAction.java) (revision 1bddf2af8d3cd3191a23d54a718bd3f313cb1aea) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java (.../LearningAction.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) @@ -118,7 +118,7 @@ .getSessionBySessionId(toolSessionID); if (scribeSession == null) { throw new ScribeException( - "Cannot retreive session with toolSessionID" + "Cannot retrieve session with toolSessionID" + toolSessionID); } Scribe scribe = scribeSession.getScribe(); Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java =================================================================== diff -u -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82 -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java (.../LearningAction.java) (revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java (.../LearningAction.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) @@ -106,7 +106,7 @@ .getSessionBySessionId(toolSessionID); if (videoRecorderSession == null) { throw new VideoRecorderException( - "Cannot retreive session with toolSessionID" + "Cannot retrieve session with toolSessionID" + toolSessionID); } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java =================================================================== diff -u -rf08d91b95c1892c71594dd4f7fd6e9b4509cccc7 -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision f08d91b95c1892c71594dd4f7fd6e9b4509cccc7) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) @@ -115,7 +115,7 @@ // Retrieve the session and content. WikiSession wikiSession = wikiService.getSessionBySessionId(toolSessionID); if (wikiSession == null) { - throw new WikiException("Cannot retreive session with toolSessionID" + toolSessionID); + throw new WikiException("Cannot retrieve session with toolSessionID" + toolSessionID); } Wiki wiki = wikiSession.getWiki(); Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java =================================================================== diff -u -rc950f1229e26a9532391d9a07356161bf80ed270 -r228482c7a091c7691a9fc9651e46a8d98e29a6e1 --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java (.../LearningAction.java) (revision c950f1229e26a9532391d9a07356161bf80ed270) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java (.../LearningAction.java) (revision 228482c7a091c7691a9fc9651e46a8d98e29a6e1) @@ -106,7 +106,7 @@ // Retrieve the session and content. WookieSession wookieSession = wookieService.getSessionBySessionId(toolSessionID); if (wookieSession == null) { - throw new WookieException("Cannot retreive session with toolSessionID" + toolSessionID); + throw new WookieException("Cannot retrieve session with toolSessionID" + toolSessionID); } Wookie wookie = wookieSession.getWookie();