Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java,v diff -u -r1.11 -r1.12 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java 7 Feb 2011 17:55:41 -0000 1.11 +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java 21 Mar 2012 13:33:48 -0000 1.12 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java,v diff -u -r1.29 -r1.30 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java 17 May 2011 02:21:54 -0000 1.29 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java 21 Mar 2012 13:35:02 -0000 1.30 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java,v diff -u -r1.16 -r1.17 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java 22 Oct 2008 02:35:55 -0000 1.16 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java 21 Mar 2012 13:37:51 -0000 1.17 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java,v diff -u -r1.12 -r1.13 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java 10 Feb 2011 22:47:56 -0000 1.12 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java 21 Mar 2012 13:35:53 -0000 1.13 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java,v diff -u -r1.13 -r1.14 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java 18 May 2011 16:43:24 -0000 1.13 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java 21 Mar 2012 13:39:56 -0000 1.14 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java,v diff -u -r1.11 -r1.12 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java 17 May 2011 04:35:35 -0000 1.11 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java 21 Mar 2012 13:41:46 -0000 1.12 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java,v diff -u -r1.4 -r1.5 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java 16 Dec 2011 10:21:57 -0000 1.4 +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java 21 Mar 2012 13:40:53 -0000 1.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java,v diff -u -r1.50 -r1.51 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java 12 Apr 2011 12:21:33 -0000 1.50 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java 21 Mar 2012 13:42:49 -0000 1.51 @@ -421,7 +421,7 @@ dto.setLimitUploadLeft(limitUploadLeft); } - // retreive notebook reflection entry. + // retrieve notebook reflection entry. ISubmitFilesService submitFilesService = getService(); NotebookEntry notebookEntry = submitFilesService.getEntry((Long) sessionMap