Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== diff -u -r59eebef4ec299e742e666db0e3b8064bd339595a -r4377cb222ae6df564b855687aeddb23f9a380a45 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 59eebef4ec299e742e666db0e3b8064bd339595a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 4377cb222ae6df564b855687aeddb23f9a380a45) @@ -484,7 +484,7 @@ throw new ImportToolContentException(e); } - return -1; + return null; } public Object importToolContent(String toolContentPath, IToolContentHandler toolContentHandler) throws ImportToolContentException{ Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java =================================================================== diff -u -r5b0f0dde5f91d80e5beb0b2f5109c347bbb946f0 -r4377cb222ae6df564b855687aeddb23f9a380a45 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java (.../IExportToolContentService.java) (revision 5b0f0dde5f91d80e5beb0b2f5109c347bbb946f0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java (.../IExportToolContentService.java) (revision 4377cb222ae6df564b855687aeddb23f9a380a45) @@ -24,6 +24,8 @@ /* $Id$ */ package org.lamsfoundation.lams.learningdesign.service; +import java.util.List; + import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.usermanagement.User; /** @@ -38,10 +40,10 @@ * in this learning design. * * @param learningDesignId - * @return + * @return the full file path of exported learning design zip file. * @throws ExportToolContentException */ - String exportLearningDesign(Long learningDesignId) throws ExportToolContentException; + String exportLearningDesign(Long learningDesignId, List toolsErrorMsgs) throws ExportToolContentException; /** * Export tool content. * @@ -86,9 +88,10 @@ * @param learningDesignPath * @param importer * @param workspaceFolderUid + * @return learningDesignID * @throws ImportToolContentException */ - void importLearningDesign(String learningDesignPath,User importer, Integer workspaceFolderUid) throws ImportToolContentException; + Long importLearningDesign(String learningDesignPath,User importer, Integer workspaceFolderUid, List toolsErrorMsgs) throws ImportToolContentException; Object importToolContent(String toolContentPath, IToolContentHandler toolContentHandler) throws ImportToolContentException;