Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -rcea798b3457c895676bf1cc5ebb3013eee53f505 -rb7149ecd0947dc6187b527c725ab2f4b6503f375 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -rb7149ecd0947dc6187b527c725ab2f4b6503f375 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java (.../ToolContentManager.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java (.../ToolContentManager.java) (revision b7149ecd0947dc6187b527c725ab2f4b6503f375) @@ -23,6 +23,8 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool; +import java.util.List; + import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.SessionDataExistsException; import org.lamsfoundation.lams.tool.exception.ToolException; @@ -96,4 +98,23 @@ */ public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException; + + /** + * 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; + + /** + * 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 exportToolContent(List toolContentId) + throws ToolException; + + } Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -rb7149ecd0947dc6187b527c725ab2f4b6503f375 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java (.../ToolSessionManager.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java (.../ToolSessionManager.java) (revision b7149ecd0947dc6187b527c725ab2f4b6503f375) @@ -65,15 +65,17 @@ throws DataMissingException, ToolException; /** - * Export the XML fragment for the session export. Not sure if this is required. + * Export the XML fragment for the session export. Not used yet - will be used + * when we do exports of designs and lesson data. * @throws DataMissingException if no tool session matches the toolSessionId * @throws ToolException if any other error occurs */ public ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException; /** - * Export the XML fragment for the session export. Not sure if this is required. + * Export the XML fragment for the session export. Not used yet - will be used + * when we do exports of designs and lesson data. * @throws DataMissingException if no tool session matches the toolSessionId * @throws ToolException if any other error occurs */ Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== diff -u -r1dd82cbb7a19c78580368ed1441abf588a878e17 -rb7149ecd0947dc6187b527c725ab2f4b6503f375 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 1dd82cbb7a19c78580368ed1441abf588a878e17) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision b7149ecd0947dc6187b527c725ab2f4b6503f375) @@ -233,7 +233,29 @@ // TODO Auto-generated method stub } + + /** + * 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 exportToolContent(List toolContentId) throws ToolException { + // TODO Auto-generated method stub + return null; + } + + /* ********** IChatService Methods ************************************** */ public Long getDefaultContentIdBySignature(String toolSignature) { Long toolContentId = null; @@ -665,4 +687,5 @@ public void setLearnerService(ILearnerService learnerService) { this.learnerService = learnerService; } + } Index: lams_tool_example/src/java/org/lamsfoundation/lams/tool/example/service/ExampleService.java =================================================================== diff -u -r4cf441aaa63b119e1b4261441d1d650a5dccae4c -rb7149ecd0947dc6187b527c725ab2f4b6503f375 --- lams_tool_example/src/java/org/lamsfoundation/lams/tool/example/service/ExampleService.java (.../ExampleService.java) (revision 4cf441aaa63b119e1b4261441d1d650a5dccae4c) +++ lams_tool_example/src/java/org/lamsfoundation/lams/tool/example/service/ExampleService.java (.../ExampleService.java) (revision b7149ecd0947dc6187b527c725ab2f4b6503f375) @@ -120,7 +120,29 @@ // TODO Auto-generated method stub } + + /** + * 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 exportToolContent(List toolContentId) throws ToolException { + // TODO Auto-generated method stub + return null; + } + + /* ******************* Used by Spring to "inject" the linked objects **************************/ public IExampleAttachmentDAO getExampleAttachmentDAO() { return exampleAttachmentDAO; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r12f7e39b451ed00ce91cffcf66efd129252d2cfc -rb7149ecd0947dc6187b527c725ab2f4b6503f375 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 12f7e39b451ed00ce91cffcf66efd129252d2cfc) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision b7149ecd0947dc6187b527c725ab2f4b6503f375) @@ -585,6 +585,28 @@ } 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; + } + + /** + * 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 exportToolContent(List toolContentId) throws ToolException { + // TODO Auto-generated method stub + return null; + } + /** @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long, java.lang.String, java.lang.Long) */ public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { ForumToolSession session = new ForumToolSession(); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -rc9531327d15636b54f293077ee1cd9f60195381b -rb7149ecd0947dc6187b527c725ab2f4b6503f375 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision c9531327d15636b54f293077ee1cd9f60195381b) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision b7149ecd0947dc6187b527c725ab2f4b6503f375) @@ -1501,7 +1501,28 @@ } + /** + * 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 exportToolContent(List toolContentId) throws ToolException { + // TODO Auto-generated method stub + return null; + } + + /** * it is possible that the tool session id already exists in the tool sessions table * as the users from the same session are involved. * existsSession(long toolSessionId) Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -rab1fbeffaf558570ec5d2b3e379e26cecbd9a618 -rb7149ecd0947dc6187b527c725ab2f4b6503f375 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision ab1fbeffaf558570ec5d2b3e379e26cecbd9a618) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision b7149ecd0947dc6187b527c725ab2f4b6503f375) @@ -1302,8 +1302,28 @@ } } - + /** + * 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 exportToolContent(List toolContentId) throws ToolException { + // TODO Auto-generated method stub + return null; + } + + /** * it is possible that the tool session id already exists in the tool sessions table * as the users from the same session are involved. * existsSession(long toolSessionId) Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -refd7c3821cc60986ef072a3fbd82d26ddcc7a926 -rb7149ecd0947dc6187b527c725ab2f4b6503f375 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision efd7c3821cc60986ef072a3fbd82d26ddcc7a926) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision b7149ecd0947dc6187b527c725ab2f4b6503f375) @@ -789,7 +789,28 @@ 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 exportToolContent(List toolContentId) throws ToolException { + // TODO Auto-generated method stub + return null; + } + + public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { ResourceSession session = new ResourceSession(); session.setSessionId(toolSessionId); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java =================================================================== diff -u -r1bf30edca36c1de9ca329e9140bf4673c1225028 -rb7149ecd0947dc6187b527c725ab2f4b6503f375 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 1bf30edca36c1de9ca329e9140bf4673c1225028) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision b7149ecd0947dc6187b527c725ab2f4b6503f375) @@ -881,6 +881,27 @@ throw new DataMissingException("No tool session matches this tool session id"); } */ + /** + * 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 exportToolContent(List toolContentId) throws ToolException { + // TODO Auto-generated method stub + return null; + } + /* ===============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/service/SubmitFilesService.java =================================================================== diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rb7149ecd0947dc6187b527c725ab2f4b6503f375 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision d9c7ddef141d19423b6ab2914d153c2cb748f187) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision b7149ecd0947dc6187b527c725ab2f4b6503f375) @@ -215,7 +215,27 @@ } } + /** + * 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 exportToolContent(List toolContentId) throws ToolException { + // TODO Auto-generated method stub + return null; + } + /* * (non-Javadoc) * Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== diff -u -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 -rb7149ecd0947dc6187b527c725ab2f4b6503f375 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision b7149ecd0947dc6187b527c725ab2f4b6503f375) @@ -1489,8 +1489,28 @@ } } + /** + * 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 exportToolContent(List toolContentId) throws ToolException { + // TODO Auto-generated method stub + return null; + } + + /** * Implemented as part of the tool contract. Sets the defineLater to true on this content. * setAsDefineLater(Long toolContentId) throws DataMissingException, ToolException * @param toolContentId