Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java =================================================================== diff -u -r4efa164a1d5bfa5e91d2c00ee471394277f90050 -rbef0532f6eae24daa6c5452e211da0ae91dfb1a5 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java (.../IWorkspaceManagementService.java) (revision 4efa164a1d5bfa5e91d2c00ee471394277f90050) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java (.../IWorkspaceManagementService.java) (revision bef0532f6eae24daa6c5452e211da0ae91dfb1a5) @@ -222,8 +222,6 @@ * @param contentTypeID The type of content being added.(FILE/PACKAGE) * @param name The name of the file * @param description The description of the file - * @param createDateTime The date and time this content was created - * @param lastModifiedDate The date and time this content was last modified * @param workspaceFolderID The container(workspaceFolder)which * holds this content * @param mimeType The MIME type of the file @@ -232,10 +230,7 @@ * FLASH client. * @throws Exception */ - public String createWorkspaceFolderContent(Integer contentTypeID,String name, - String description,Date createDateTime, - Date lastModifiedDate,Integer workspaceFolderID, - String mimeType, String path)throws Exception; + public String createWorkspaceFolderContent(Integer contentTypeID, String name, String description, Integer workspaceFolderID, String mimeType, String path) throws Exception; /** * This method updates an existing file(workspaceFolderContet) Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== diff -u -r6d8bb54672dae8e88c90916b6b28ae3ce525a685 -rbef0532f6eae24daa6c5452e211da0ae91dfb1a5 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision 6d8bb54672dae8e88c90916b6b28ae3ce525a685) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision bef0532f6eae24daa6c5452e211da0ae91dfb1a5) @@ -624,50 +624,48 @@ } } + /** - * (non-Javadoc) - * @see org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService#createWorkspaceFolderContent(java.lang.Integer, java.lang.String, java.lang.String, java.util.Date, java.util.Date, java.lang.Integer, java.lang.String, java.lang.String) + * @see org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService#createWorkspaceFolderContent(java.lang.Integer, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String) */ - public String createWorkspaceFolderContent(Integer contentTypeID,String name, - String description,Date createDateTime, - Date lastModifiedDate,Integer workspaceFolderID, - String mimeType, String path)throws Exception{ + public String createWorkspaceFolderContent(Integer contentTypeID,String name,String description,Integer workspaceFolderID, String mimeType, String path) throws Exception{ // TODO add some validation so that a non-unique name doesn't result in an index violation // bit hard for the user to understand. WorkspaceFolder workspaceFolder = workspaceFolderDAO.getWorkspaceFolderByID(workspaceFolderID); if(workspaceFolder!=null){ - WorkspaceFolderContent workspaceFolderContent = new WorkspaceFolderContent(contentTypeID,name,description,createDateTime,lastModifiedDate,mimeType,workspaceFolder); - workspaceFolderContentDAO.insert(workspaceFolderContent); - try{ - InputStream stream = new FileInputStream(path); - NodeKey nodeKey = addFileToRepository(stream,name,mimeType); - workspaceFolderContent.setUuid(nodeKey.getUuid()); - workspaceFolderContent.setVersionID(nodeKey.getVersion()); - workspaceFolderContentDAO.update(workspaceFolderContent); - - UpdateContentDTO contentDTO = new UpdateContentDTO(nodeKey.getUuid(), nodeKey.getVersion(), - new Long(workspaceFolder.getWorkspaceFolderId().longValue())); - flashMessage = new FlashMessage("createWorkspaceFolderContent",contentDTO); - - }catch(AccessDeniedException ae){ - flashMessage = new FlashMessage("createWorkspaceFolderContent", - "Exception occured while creating workspaceFolderContent: "+ ae.getMessage(), - FlashMessage.CRITICAL_ERROR); - }catch(FileException fe){ - flashMessage = new FlashMessage("createWorkspaceFolderContent", - "Exception occured while creating workspaceFolderContent: "+ fe.getMessage(), - FlashMessage.CRITICAL_ERROR); - - }catch(InvalidParameterException ip){ - flashMessage = new FlashMessage("createWorkspaceFolderContent", - "Exception occured while creating workspaceFolderContent: "+ ip.getMessage(), - FlashMessage.CRITICAL_ERROR); - } + WorkspaceFolderContent workspaceFolderContent = new WorkspaceFolderContent(contentTypeID,name,description,new Date(),new Date(),mimeType,workspaceFolder); + workspaceFolderContentDAO.insert(workspaceFolderContent); + try{ + InputStream stream = new FileInputStream(path); + NodeKey nodeKey = addFileToRepository(stream,name,mimeType); + workspaceFolderContent.setUuid(nodeKey.getUuid()); + workspaceFolderContent.setVersionID(nodeKey.getVersion()); + workspaceFolderContentDAO.update(workspaceFolderContent); + + UpdateContentDTO contentDTO = new UpdateContentDTO(nodeKey.getUuid(), nodeKey.getVersion(), + new Long(workspaceFolder.getWorkspaceFolderId().longValue())); + flashMessage = new FlashMessage("createWorkspaceFolderContent",contentDTO); + + }catch(AccessDeniedException ae){ + flashMessage = new FlashMessage("createWorkspaceFolderContent", + "Exception occured while creating workspaceFolderContent: "+ ae.getMessage(), + FlashMessage.CRITICAL_ERROR); + }catch(FileException fe){ + flashMessage = new FlashMessage("createWorkspaceFolderContent", + "Exception occured while creating workspaceFolderContent: "+ fe.getMessage(), + FlashMessage.CRITICAL_ERROR); + + }catch(InvalidParameterException ip){ + flashMessage = new FlashMessage("createWorkspaceFolderContent", + "Exception occured while creating workspaceFolderContent: "+ ip.getMessage(), + FlashMessage.CRITICAL_ERROR); + } }else - flashMessage = FlashMessage.getNoSuchWorkspaceFolderExsists("createWorkspaceFolderContent",workspaceFolderID); + flashMessage = FlashMessage.getNoSuchWorkspaceFolderExsists("createWorkspaceFolderContent",workspaceFolderID); return flashMessage.serializeMessage(); } + /** * (non-Javadoc) * @see org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService#updateWorkspaceFolderContent(java.lang.Long, java.io.InputStream)