Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v diff -u -r1.46 -r1.47 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 26 May 2006 04:28:03 -0000 1.46 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 29 May 2006 07:13:06 -0000 1.47 @@ -586,25 +586,23 @@ forumDao.delete(forum); } + /** * Export the XML fragment for the tool's content, along with any files needed * for the content. * @throws DataMissingException if no tool content matches the toolSessionId * @throws ToolException if any other error occurs */ - public String exportToolContent(Long toolContentId) throws DataMissingException, ToolException { - // TODO Auto-generated method stub - return null; + + public void exportToolContent(Long toolContentId, String toPath) throws DataMissingException, ToolException { } /** * Import the XML fragment for the tool's content, along with any files needed * for the content. * @throws ToolException if any other error occurs */ - public String importToolContent(Long toolContentId, String reference, String directory) throws ToolException { - // TODO Auto-generated method stub - return null; + public void importToolContent(Object toolContnetPOJO) throws ToolException { } /** @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long, java.lang.String, java.lang.Long) */ @@ -639,7 +637,6 @@ } return learnerService.completeToolSession(toolSessionId,learnerId); } - public ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException { return null; } @@ -648,6 +645,7 @@ return null; } + public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException { forumToolSessionDao.delete(toolSessionId); } @@ -766,4 +764,6 @@ this.learnerService = learnerService; } + + } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v diff -u -r1.60 -r1.61 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 26 May 2006 23:35:41 -0000 1.60 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 29 May 2006 07:09:45 -0000 1.61 @@ -1507,32 +1507,21 @@ * @throws DataMissingException if no tool content matches the toolSessionId * @throws ToolException if any other error occurs */ - public String exportToolContent(Long toolContentId) throws DataMissingException, ToolException { - // TODO Auto-generated method stub - return null; + + public void exportToolContent(Long toolContentId, String toPath) throws DataMissingException, ToolException { } - - /** - * Export the XML fragment for the tool's content, along with any files needed - * for the content. - * @throws ToolException if any other error occurs - */ - public String exportToolContent(List toolContentId) throws ToolException { - // TODO Auto-generated method stub - return null; - } - /** * Import the XML fragment for the tool's content, along with any files needed * for the content. * @throws ToolException if any other error occurs */ - public String importToolContent(Long toolContentId, String reference, String directory) throws ToolException { - // TODO Auto-generated method stub - return null; + public void importToolContent(Object toolContnetPOJO) throws ToolException { } + + + /** * it is possible that the tool session id already exists in the tool sessions table * as the users from the same session are involved. @@ -2350,4 +2339,5 @@ public void setLearnerService(ILearnerService learnerService) { this.learnerService = learnerService; } + } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v diff -u -r1.50 -r1.51 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 26 May 2006 23:48:23 -0000 1.50 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 29 May 2006 07:14:44 -0000 1.51 @@ -1302,36 +1302,22 @@ } } - /** + /** * Export the XML fragment for the tool's content, along with any files needed * for the content. * @throws DataMissingException if no tool content matches the toolSessionId * @throws ToolException if any other error occurs */ - public String exportToolContent(Long toolContentId) throws DataMissingException, ToolException { - // TODO Auto-generated method stub - return null; - } - - /** - * Export the XML fragment for the tool's content, along with any files needed - * for the content. - * @throws ToolException if any other error occurs - */ - public String exportToolContent(List toolContentId) throws ToolException { - // TODO Auto-generated method stub - return null; + public void exportToolContent(Long toolContentId, String toPath) throws DataMissingException, ToolException { } /** * Import the XML fragment for the tool's content, along with any files needed * for the content. * @throws ToolException if any other error occurs */ - public String importToolContent(Long toolContentId, String reference, String directory) throws ToolException { - // TODO Auto-generated method stub - return null; + public void importToolContent(Object toolContnetPOJO) throws ToolException { } /** Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml,v diff -u -r1.8 -r1.9 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml 17 May 2006 11:42:40 -0000 1.8 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml 29 May 2006 07:15:17 -0000 1.9 @@ -104,6 +104,9 @@ + + + Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v diff -u -r1.28 -r1.29 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 26 May 2006 04:28:55 -0000 1.28 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 29 May 2006 07:15:17 -0000 1.29 @@ -51,6 +51,8 @@ import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; import org.lamsfoundation.lams.learning.service.ILearnerService; +import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; +import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; import org.lamsfoundation.lams.tool.ToolSessionManager; @@ -106,7 +108,8 @@ private ILamsToolService toolService; private ILearnerService learnerService; private IAuditService auditService; - + private IExportToolContentService exportContentService; + public IVersionedNode getFileNode(Long itemUid, String relPathString) throws ResourceApplicationException { ResourceItem item = (ResourceItem) resourceItemDao.getObject(ResourceItem.class,itemUid); if ( item == null ) @@ -730,6 +733,30 @@ //******************************************************************************* //ToolContentManager, ToolSessionManager methods //******************************************************************************* + + public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { + Resource toolContentObj = resourceDao.getByContentId(toolContentId); + if(toolContentObj == null) + throw new DataMissingException("Unable to find tool content by given id :" + toolContentId); + + toolContentObj = Resource.newInstance(toolContentObj,toolContentId,resourceToolContentHandler); + toolContentObj.setToolContentHandler(null); + toolContentObj.setOfflineFileList(null); + toolContentObj.setOnlineFileList(null); + toolContentObj.setMiniViewNumberStr(null); + try { + exportContentService.registerFileHandleClass("org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment","fileUuid","fileVersionId"); + exportContentService.registerFileHandleClass("org.lamsfoundation.lams.tool.rsrc.model.ResourceItem","fileUuid","fileVersionId"); + exportContentService.exportToolContent( toolContentId, toolContentObj,resourceToolContentHandler, rootPath); + } catch (ExportToolContentException e) { + throw new ToolException(e); + } + } + + + public void importToolContent(Object toolContnetPOJO) throws ToolException { + } + public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { if (fromContentId == null || toContentId == null) throw new ToolException( @@ -789,27 +816,6 @@ resourceDao.delete(resource); } - /** - * Export the XML fragment for the tool's content, along with any files needed - * for the content. - * @throws DataMissingException if no tool content matches the toolSessionId - * @throws ToolException if any other error occurs - */ - public String exportToolContent(Long toolContentId) throws DataMissingException, ToolException { - // TODO Auto-generated method stub - return null; - } - - /** - * Import the XML fragment for the tool's content, along with any files needed - * for the content. - * @throws ToolException if any other error occurs - */ - public String importToolContent(Long toolContentId, String reference, String directory) throws ToolException { - // TODO Auto-generated method stub - return null; - } - public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { ResourceSession session = new ResourceSession(); @@ -860,4 +866,15 @@ } + public IExportToolContentService getExportContentService() { + return exportContentService; + } + + + public void setExportContentService(IExportToolContentService exportContentService) { + this.exportContentService = exportContentService; + } + + + } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java,v diff -u -r1.21 -r1.22 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 26 May 2006 04:28:43 -0000 1.21 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 29 May 2006 07:15:55 -0000 1.22 @@ -887,21 +887,17 @@ * @throws DataMissingException if no tool content matches the toolSessionId * @throws ToolException if any other error occurs */ - public String exportToolContent(Long toolContentId) throws DataMissingException, ToolException { - // TODO Auto-generated method stub - return null; + + public void exportToolContent(Long toolContentId, String toPath) throws DataMissingException, ToolException { } /** * Import the XML fragment for the tool's content, along with any files needed * for the content. * @throws ToolException if any other error occurs */ - public String importToolContent(Long toolContentId, String reference, String directory) throws ToolException { - // TODO Auto-generated method stub - return null; + public void importToolContent(Object toolContnetPOJO) throws ToolException { } - /* ===============Methods implemented from ToolSessionManager =============== */ /** @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long, java.lang.String, java.lang.Long) */ Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java,v diff -u -r1.11 -r1.12 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java 6 Apr 2006 06:41:34 -0000 1.11 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java 29 May 2006 07:17:36 -0000 1.12 @@ -367,4 +367,12 @@ return obj; } + public IToolContentHandler getToolContentHandler() { + return toolContentHandler; + } + + public void setToolContentHandler(IToolContentHandler toolContentHandler) { + this.toolContentHandler = toolContentHandler; + } + } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml,v diff -u -r1.12 -r1.13 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 22 Feb 2006 01:03:32 -0000 1.12 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 29 May 2006 07:17:36 -0000 1.13 @@ -54,6 +54,7 @@ + @@ -72,10 +73,12 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED,-java.lang.Exception - PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v diff -u -r1.42 -r1.43 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 26 May 2006 04:28:33 -0000 1.42 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 29 May 2006 07:17:25 -0000 1.43 @@ -56,6 +56,8 @@ import org.lamsfoundation.lams.contentrepository.service.RepositoryProxy; import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; import org.lamsfoundation.lams.learning.service.ILearnerService; +import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; +import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; import org.lamsfoundation.lams.tool.ToolSessionManager; @@ -82,8 +84,8 @@ import org.lamsfoundation.lams.usermanagement.dao.IUserDAO; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator; -import org.springframework.dao.DataAccessException; import org.lamsfoundation.lams.util.DateUtil; +import org.springframework.dao.DataAccessException; /** * @author Manpreet Minhas @@ -104,7 +106,7 @@ private ILamsToolService toolService; private ILearnerService learnerService; private IRepositoryService repositoryService; - + private IExportToolContentService exportContentService; /** * (non-Javadoc) * @@ -218,22 +220,24 @@ /** * Export the XML fragment for the tool's content, along with any files needed * for the content. - * @throws DataMissingException if no tool content matches the toolSessionId - * @throws ToolException if any other error occurs + * @throws ExportToolContentException */ - public String exportToolContent(Long toolContentId) throws DataMissingException, ToolException { - // TODO Auto-generated method stub - return null; + public void exportToolContent(Long toolContentId , String toPath) throws ToolException, DataMissingException{ + exportContentService.registerFileHandleClass("org.lamsfoundation.lams.tool.sbmt.InstructionFiles","uuID","versionID"); + SubmitFilesContent toolContentObj = submitFilesContentDAO.getContentByID(toolContentId); + if(toolContentObj == null) + throw new DataMissingException("Unable to find tool content by given id :" + toolContentId); + + toolContentObj = SubmitFilesContent.newInstance(toolContentObj,toolContentId,sbmtToolContentHandler); + toolContentObj.setToolSession(null); + toolContentObj.setToolContentHandler(null); + try { + exportContentService.exportToolContent( toolContentId, toolContentObj,sbmtToolContentHandler, toPath); + } catch (ExportToolContentException e) { + throw new ToolException(e); + } } - - /** - * Import the XML fragment for the tool's content, along with any files needed - * for the content. - * @throws ToolException if any other error occurs - */ - public String importToolContent(Long toolContentId, String reference, String directory) throws ToolException { - // TODO Auto-generated method stub - return null; + public void importToolContent(Object toolContnetPOJO) throws ToolException { } /* @@ -835,6 +839,12 @@ public void setToolService(ILamsToolService toolService) { this.toolService = toolService; } + public IExportToolContentService getExportContentService() { + return exportContentService; + } + public void setExportContentService(IExportToolContentService exportContentService) { + this.exportContentService = exportContentService; + } } \ No newline at end of file