Index: lams_central/src/java/org/lamsfoundation/lams/applicationResources.properties =================================================================== diff -u -r05391c36b578d825a02985084cbdd948366ae182 -r43c1735264f0b042ab12a098847f358e4fcafe99 --- lams_central/src/java/org/lamsfoundation/lams/applicationResources.properties (.../applicationResources.properties) (revision 05391c36b578d825a02985084cbdd948366ae182) +++ lams_central/src/java/org/lamsfoundation/lams/applicationResources.properties (.../applicationResources.properties) (revision 43c1735264f0b042ab12a098847f358e4fcafe99) @@ -24,9 +24,37 @@ flash.validation.error.OptionalActivity=An Optional Activity must have one or more activities flash.validation.error.OptionalActivityOrderId=This Optional Activity has invalid order ids +# +invalid.wddx.packet=Invalid Object in WDDX packet. Error was {0}. +no.such.learningdesign.exist=No Learning Design with learning_design_id of:{0} exists. +no.such.user.exist=No such User with a user_id of: {0} exists. +no.such.workspace.exist=No such WorkspaceFolder with workspace_folder_id of:{0} exists. #====================================================================# #=========================WorkingSpace labels===========================# #====================================================================# - - - \ No newline at end of file +delete.resource.error=Cannot delete the resource: {0} +delete.resource.error.value.miss=deleteResource(Long resourceID, String resourceType, Integer userID) requires a value for resourceID, resourceType and userID. +delete.lesson.error=LAMS does not support deleting a lesson via the workspace interface. +delete.folder.error=Cannot delete this folder as it is the Root folder. +delete.learningdesign.error=Cannot delete design with learning_design_id of : {0} as it is READ ONLY. +folder.delete=Folder deleted:{0} +copy.resource.error=Cannot copy the resource:{0} +copy.resource.error.value.miss=copyResource(Long resourceID,Integer targetFolderID, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID +copy.no.support=LAMS does not support copying a file via the workspace interface. +unable.copy=Unable to copy learning design due to an error{0}. +no.such.user=No such user with a userID of {0} exists. +no.such.workspace=No such workspaceFolder with a workspace_folder_id of {0} exists. +learningdesign.delete=Learning Design deleted:{0} +learningdesign.readonly=Cannot delete design with learning_design_id of:{0} as it is READ ONLY. +move.resource.error=Cannot move the resource:{0} +move.resrouce.error.value.miss=moveResource(Long resourceID,Integer targetFolderID, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID +unsupport.move=LAMS does not support moving a file via the workspace interface. +creating.workspace.folder.error= Exception occured while creating workspaceFolderContent:{0}. +resource.already.exist="The resource {0} already exists in the repository: {1}. +no.such.content="No such content with versionID of {0} found in repository {1}. +content.delete.success=Content Successfully deleted. +rename.resource.error=Cannot rename the resource: {0} +rename.resource.error.miss.vaue=renameResource(Long resourceID,Integer newName, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID. +rename.resource.unspport=LAMS does not support renaming a file via the workspace interface. +folder.already.exist=A folder with given name '{0}' already exists. +can.not.rename.root.folder=Cannot rename the ROOT folder. \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -r05391c36b578d825a02985084cbdd948366ae182 -r43c1735264f0b042ab12a098847f358e4fcafe99 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 05391c36b578d825a02985084cbdd948366ae182) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 43c1735264f0b042ab12a098847f358e4fcafe99) @@ -253,15 +253,15 @@ LearningDesign originalDesign = learningDesignDAO.getLearningDesignById(originalDesignID); if(originalDesign==null) - throw new LearningDesignException("No Learning Design with learning_design_id of:" + originalDesignID +" exists"); + throw new LearningDesignException(messageService.getMessage("no.such.learningdesign.exist",new Object[]{originalDesignID})); User user = userDAO.getUserById(userID); if(user==null) - throw new UserException("No such User with a user_id of:" + userID + " exists"); + throw new UserException(messageService.getMessage("no.such.user.exist",new Object[]{userID})); WorkspaceFolder workspaceFolder = workspaceFolderDAO.getWorkspaceFolderByID(workspaceFolderID); if(workspaceFolder==null) - throw new WorkspaceFolderException("No such WorkspaceFolder with workspace_folder_id of:" + workspaceFolderID + " exists"); + throw new WorkspaceFolderException(messageService.getMessage("no.such.workspace.exist",new Object[]{workspaceFolderID})); return copyLearningDesign(originalDesign,copyType,user,workspaceFolder, setOriginalDesign); } @@ -423,7 +423,7 @@ flashMessage = new FlashMessage(IAuthoringService.STORE_LD_MESSAGE_KEY,design.getLearningDesignId()); } catch ( ObjectExtractorException e ) { flashMessage = new FlashMessage(IAuthoringService.STORE_LD_MESSAGE_KEY, - "Invalid Object in WDDX packet. Error was "+e.getMessage(), + messageService.getMessage("invalid.wddx.packet",new Object[]{e.getMessage()}), FlashMessage.ERROR); } Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== diff -u -r05391c36b578d825a02985084cbdd948366ae182 -r43c1735264f0b042ab12a098847f358e4fcafe99 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision 05391c36b578d825a02985084cbdd948366ae182) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision 43c1735264f0b042ab12a098847f358e4fcafe99) @@ -177,7 +177,7 @@ String errorMessage = null; if ( resourceID == null || resourceType == null || userID== null ) { - errorMessage = "deleteResource(Long resourceID, String resourceType, Integer userID) requires a value for resourceID, resourceType and userID"; + errorMessage = messageService.getMessage("delete.resource.error.value.miss"); } else if ( FolderContentDTO.DESIGN.equals(resourceType) ) { return deleteLearningDesign(resourceID, userID); } else if ( FolderContentDTO.FOLDER.equals(resourceType) ) { @@ -186,11 +186,11 @@ return deleteWorkspaceFolderContent(resourceID); } else if ( FolderContentDTO.LESSON.equals(resourceType) ) { // TODO implement delete lesson - errorMessage = "LAMS does not support deleting a lesson via the workspace interface. "; + errorMessage = messageService.getMessage("delete.lesson.error"); } FlashMessage message = new FlashMessage(MSG_KEY_DELETE, - "Cannot delete the resource: "+errorMessage, + messageService.getMessage("delete.resource.error",new Object[]{errorMessage}), FlashMessage.ERROR); return message.serializeMessage(); @@ -225,7 +225,7 @@ if(workspaceFolder!=null){ if(isRootFolder(workspaceFolder)) flashMessage = new FlashMessage(MSG_KEY_DELETE, - "Cannot delete this folder as it is the Root folder.", + messageService.getMessage("delete.folder.error"), FlashMessage.ERROR); else{ flashMessage = deleteFolderContents(workspaceFolder, userID); @@ -297,8 +297,8 @@ if (learningDesign.getReadOnly().booleanValue()) { isDeleteSuccessful = false; flashMessage = new FlashMessage(MSG_KEY_DELETE, - "Cannot delete design with learning_design_id of :" + learningDesignID + - " as it is READ ONLY.", FlashMessage.ERROR); + messageService.getMessage("delete.learningdesign.error",new Object[]{learningDesignID}) + , FlashMessage.ERROR); } else { @@ -317,7 +317,7 @@ if(isDeleteSuccessful) //it will only delete this folder if all the files/folder/learningDesigns are all deleted { workspaceFolderDAO.delete(folder); - flashMessage = new FlashMessage(MSG_KEY_DELETE,"Folder deleted:" + folderID); + flashMessage = new FlashMessage(MSG_KEY_DELETE,messageService.getMessage("folder.delete", new Object[]{folderID})); } return flashMessage; @@ -517,21 +517,21 @@ String errorMessage = null; if ( resourceID == null || targetFolderID == null || resourceType == null || userID== null ) { - errorMessage = "copyResource(Long resourceID,Integer targetFolderID, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID"; + errorMessage = messageService.getMessage("copy.resource.error.value.miss"); } else if ( FolderContentDTO.DESIGN.equals(resourceType) ) { return copyLearningDesign(resourceID,targetFolderID,copyType,userID); } else if ( FolderContentDTO.FOLDER.equals(resourceType) ) { return copyFolder(new Integer(resourceID.intValue()), targetFolderID, userID); } else if ( FolderContentDTO.FILE.equals(resourceType) ) { // TODO implement delete file resource - errorMessage = "LAMS does not support copying a file via the workspace interface. "; + errorMessage = messageService.getMessage("copy.no.support"); } else if ( FolderContentDTO.LESSON.equals(resourceType) ) { // TODO implement delete lesson - errorMessage = "LAMS does not support copying a lesson via the workspace interface. "; + errorMessage = messageService.getMessage("copy.no.support"); } FlashMessage message = new FlashMessage(MSG_KEY_COPY, - "Cannot copy the resource: "+errorMessage, + messageService.getMessage("copy.resource.error",new Object[]{errorMessage}), FlashMessage.ERROR); return message.serializeMessage(); @@ -608,7 +608,7 @@ + "targetFolderID="+targetFolderID + "userID="+userID ,e); - message = new FlashMessage(MSG_KEY_COPY, "Unable to copy learning design due to an error "+e.getMessage(), FlashMessage.ERROR); + message = new FlashMessage(MSG_KEY_COPY, messageService.getMessage("unable.copy",new Object[]{e.getMessage()}), FlashMessage.ERROR); } @@ -664,7 +664,7 @@ public void copyRootContent(WorkspaceFolder workspaceFolder,WorkspaceFolder targetWorkspaceFolder, Integer userID)throws UserException{ User user = userDAO.getUserById(userID); if(user==null) - throw new UserException("No such user with a userID of " + userID + "exists"); + throw new UserException(messageService.getMessage("no.such.user",new Object[]{userID})); List designs = learningDesignDAO.getAllLearningDesignsInFolder(workspaceFolder.getWorkspaceFolderId()); if(designs!=null && designs.size()!=0){ @@ -706,10 +706,10 @@ workspaceFolderDAO.insert(workspaceFolder); return workspaceFolder; }else - throw new UserException("No such user with userID of " + userID + "exists"); + throw new UserException(messageService.getMessage("no.such.user",new Object[]{userID})); }else - throw new WorkspaceFolderException("No such workspaceFolder with a workspace_folder_id of " + parentFolderID +" exists"); + throw new WorkspaceFolderException(messageService.getMessage("no.such.workspace", new Object[]{parentFolderID})); } /** * TODO For now assuming that the folder to be created would be of type NORMAL. @@ -787,12 +787,11 @@ if(learningDesign.getUser().getUserId().equals(user.getUserId())){ if(learningDesign.getReadOnly().booleanValue()){ flashMessage = new FlashMessage(MSG_KEY_DELETE, - "Cannot delete design with learning_design_id of:" + learningDesignID + - " as it is READ ONLY.", + messageService.getMessage("learningdesign.readonly",new Object[]{learningDesignID}), FlashMessage.ERROR); }else{ learningDesignDAO.delete(learningDesign); - flashMessage = new FlashMessage(MSG_KEY_DELETE,"Learning Design deleted: "+ learningDesignID); + flashMessage = new FlashMessage(MSG_KEY_DELETE,messageService.getMessage("learningdesign.delete",new Object[]{learningDesignID})); } }else flashMessage = FlashMessage.getUserNotAuthorized(MSG_KEY_DELETE,userID); @@ -823,21 +822,21 @@ String errorMessage = null; if ( resourceID == null || targetFolderID == null || resourceType == null || userID== null ) { - errorMessage = "moveResource(Long resourceID,Integer targetFolderID, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID"; + errorMessage = messageService.getMessage("move.resrouce.error.value.miss"); } else if ( FolderContentDTO.DESIGN.equals(resourceType) ) { return moveLearningDesign(resourceID, targetFolderID, userID); } else if ( FolderContentDTO.FOLDER.equals(resourceType) ) { return moveFolder(new Integer(resourceID.intValue()), targetFolderID, userID); } else if ( FolderContentDTO.FILE.equals(resourceType) ) { // TODO implement delete file resource - errorMessage = "LAMS does not support moving a file via the workspace interface. "; + errorMessage = messageService.getMessage("unsupport.move"); } else if ( FolderContentDTO.LESSON.equals(resourceType) ) { // TODO implement delete lesson - errorMessage = "LAMS does not support moving a lesson via the workspace interface. "; + errorMessage = messageService.getMessage("unsupport.move"); } FlashMessage message = new FlashMessage(MSG_KEY_MOVE, - "Cannot move the resource: "+errorMessage, + messageService.getMessage("move.resource.error",new Object[]{errorMessage}), FlashMessage.ERROR); return message.serializeMessage(); @@ -948,23 +947,23 @@ }catch(AccessDeniedException ae){ flashMessage = new FlashMessage("createWorkspaceFolderContent", - "Exception occured while creating workspaceFolderContent: "+ ae.getMessage(), + messageService.getMessage("creating.workspace.folder.error",new Object[]{ae.getMessage()}), FlashMessage.CRITICAL_ERROR); }catch(FileException fe){ flashMessage = new FlashMessage("createWorkspaceFolderContent", - "Exception occured while creating workspaceFolderContent: "+ fe.getMessage(), + messageService.getMessage("creating.workspace.folder.error",new Object[]{fe.getMessage()}), FlashMessage.CRITICAL_ERROR); }catch(InvalidParameterException ip){ flashMessage = new FlashMessage("createWorkspaceFolderContent", - "Exception occured while creating workspaceFolderContent: "+ ip.getMessage(), + messageService.getMessage("creating.workspace.folder.error",new Object[]{ip.getMessage()}), FlashMessage.CRITICAL_ERROR); } } else { flashMessage = new FlashMessage("createWorkspaceFolderContent", - "The resource " + name + " already exists in the repository: ", + messageService.getMessage("resource.already.exist",new Object[]{name,workspaceFolderID}), FlashMessage.ERROR); } } @@ -1075,7 +1074,7 @@ files = repositoryService.deleteVersion(ticket,uuid,versionToBeDeleted); }catch(ItemNotFoundException ie){ flashMessage = new FlashMessage("deleteContentWithVersion", - "No such content with versionID of " + versionToBeDeleted + " found in repository", + messageService.getMessage("no.such.content",new Object[]{versionToBeDeleted,folderContentID}), FlashMessage.ERROR); return flashMessage.serializeMessage(); } @@ -1102,15 +1101,15 @@ workspaceFolderContent.setVersionID(latestAvailableVersion); workspaceFolderContentDAO.update(workspaceFolderContent); } - flashMessage = new FlashMessage("deleteContentWithVersion","Content Successfully deleted"); + flashMessage = new FlashMessage("deleteContentWithVersion",messageService.getMessage("content.delete.success")); }catch(ItemNotFoundException ie){ workspaceFolderContentDAO.delete(workspaceFolderContent); - flashMessage = new FlashMessage("deleteContentWithVersion","Content Successfully deleted"); + flashMessage = new FlashMessage("deleteContentWithVersion",messageService.getMessage("content.delete.success")); } } else { - flashMessage = new FlashMessage("deleteContentWithVersion","Content Successfully deleted"); + flashMessage = new FlashMessage("deleteContentWithVersion",messageService.getMessage("content.delete.success")); } return flashMessage.serializeMessage(); } @@ -1297,21 +1296,21 @@ String errorMessage = null; if ( resourceID == null || newName == null || resourceType == null || userID== null ) { - errorMessage = "renameResource(Long resourceID,Integer newName, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID"; + errorMessage = messageService.getMessage("rename.resource.error.miss.vaue"); } else if ( FolderContentDTO.DESIGN.equals(resourceType) ) { return renameLearningDesign(resourceID, newName, userID); } else if ( FolderContentDTO.FOLDER.equals(resourceType) ) { return renameWorkspaceFolder(new Integer(resourceID.intValue()), newName, userID); } else if ( FolderContentDTO.FILE.equals(resourceType) ) { // TODO implement delete file resource - errorMessage = "LAMS does not support renaming a file via the workspace interface. "; + errorMessage = messageService.getMessage("rename.resource.unspport"); } else if ( FolderContentDTO.LESSON.equals(resourceType) ) { // TODO implement delete lesson - errorMessage = "LAMS does not support renaming a lesson via the workspace interface. "; + errorMessage = messageService.getMessage("rename.resource.unspport"); } FlashMessage message = new FlashMessage(MSG_KEY_RENAME, - "Cannot rename the resource: "+errorMessage, + messageService.getMessage("rename.resource.error",new Object[]{errorMessage}), FlashMessage.ERROR); return message.serializeMessage(); @@ -1341,13 +1340,13 @@ flashMessage = new FlashMessage(MSG_KEY_RENAME,newName); }else flashMessage = new FlashMessage(MSG_KEY_RENAME, - "A folder with given name '" + newName + "' already exists.", + messageService.getMessage("folder.already.exist",new Object[]{newName}), FlashMessage.ERROR); }else flashMessage = FlashMessage.getUserNotAuthorized(MSG_KEY_RENAME,userID); }else flashMessage = new FlashMessage(MSG_KEY_RENAME, - "Cannot rename the ROOT folder", + messageService.getMessage("can.not.rename.root.folder"), FlashMessage.ERROR); }else flashMessage = FlashMessage.getNoSuchWorkspaceFolderExsists(MSG_KEY_RENAME,workspaceFolderID);