Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java,v diff -u -r1.10 -r1.11 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java 5 Jun 2006 14:27:19 -0000 1.10 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java 6 Jun 2006 04:08:57 -0000 1.11 @@ -46,8 +46,6 @@ import java.util.Set; import java.util.TreeSet; -import javax.activity.ActivityCompletedException; - import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; @@ -92,6 +90,7 @@ import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dao.IWorkspaceFolderDAO; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.FileUtilException; import org.lamsfoundation.lams.util.zipfile.ZipFileUtil; @@ -103,7 +102,6 @@ import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.Converter; -import com.thoughtworks.xstream.io.HierarchicalStreamReader; /** * Export tool content service bean. * @author Steve.Ni @@ -112,13 +110,16 @@ */ public class ExportToolContentService implements IExportToolContentService, ApplicationContextAware { public static final String LEARNING_DESIGN_SERVICE_BEAN_NAME = "learningDesignService"; + private static final String USER_SERVICE_BEAN_NAME = "userManagementService"; + //export tool content zip file prefix public static final String EXPORT_TOOLCONTNET_ZIP_PREFIX = "lams_toolcontent_"; public static final String EXPORT_TOOLCONTNET_FOLDER_SUFFIX = "export_toolcontent"; public static final String EXPORT_TOOLCONTNET_ZIP_SUFFIX = ".zip"; public static final String LEARNING_DESIGN_FILE_NAME = "learning_design.xml"; private static final String TOOL_FILE_NAME = "tool.xml"; + private Logger log = Logger.getLogger(ExportToolContentService.class); private ApplicationContext applicationContext; @@ -233,11 +234,10 @@ result = method.invoke(obj, args); - if(StringUtils.equals(method.getName(),"unmarshal")){ + if(StringUtils.equals(method.getName(),"unmarshal") && result != null){ //During deserialize XML file into object, it will save file node into fileNodes for(NameInfo name:fileHandleClassList){ - HierarchicalStreamReader reader = (HierarchicalStreamReader) args[0]; - if(name.className.equals(reader.getNodeName())){ + if(name.className.equals(result.getClass().getName())){ fileNodes.add(ExportToolContentService.this.new ValueInfo(name,result)); break; } @@ -351,20 +351,28 @@ //serialize tool xml into local file. XStream toolXml = new XStream(); + //get back Xstream default convert, create proxy then register it to XStream parser. Converter c = toolXml.getConverterLookup().defaultConverter(); - FileInvocationHandler handler = new FileInvocationHandler(c); - handler.setFileHandleClassList(fileHandleClassList); - Converter myc = (Converter) Proxy.newProxyInstance(c.getClass().getClassLoader(),new Class[]{Converter.class},handler); - toolXml.registerConverter(myc); + FileInvocationHandler handler =null; + if(!fileHandleClassList.isEmpty()){ + handler = new FileInvocationHandler(c); + handler.setFileHandleClassList(fileHandleClassList); + Converter myc = (Converter) Proxy.newProxyInstance(c.getClass().getClassLoader(),new Class[]{Converter.class},handler); + toolXml.registerConverter(myc); + } + + //XML to Object toolXml.toXML(toolContentObj,toolFile); //get out the fileNodes - List list = handler.getFileNodes(); - for(ValueInfo fileNode:list){ - log.debug("Tool attachement file is going to save : " + fileNode.fileUuid); - toolContentHandler.saveFile(fileNode.fileUuid,FileUtil.getFullPath(toolPath,fileNode.fileUuid.toString())); + if(handler != null){ + List list = handler.getFileNodes(); + for(ValueInfo fileNode:list){ + log.debug("Tool attachement file is going to save : " + fileNode.fileUuid); + toolContentHandler.saveFile(fileNode.fileUuid,FileUtil.getFullPath(toolPath,fileNode.fileUuid.toString())); + } + list.clear(); } - list.clear(); } catch (ItemNotFoundException e) { throw new ExportToolContentException(e); } catch (RepositoryCheckedException e) { @@ -392,11 +400,13 @@ fileHandleClassList.add(this.new NameInfo(fileNodeClassName, fileUuidFieldName, fileVersionFieldName, fileNameFieldName, filePropertyFieldName, mimeTypeFieldName, initialItemFieldName)); } + + /** * @throws ExportToolContentException * @see org.lamsfoundation.lams.authoring.service.IExportToolContentService.importLearningDesign(String) */ - public void importLearningDesign(String learningDesignPath,User importer, Integer workspaceFolderUid) throws ImportToolContentException { + public void importLearningDesign(String learningDesignPath, User importer, Integer workspaceFolderUid) throws ImportToolContentException { try { //import learning design @@ -423,7 +433,7 @@ //Invoke tool's importToolContent() method. ToolContentManager contentManager = (ToolContentManager) findToolService(newTool); log.debug("Tool begin to import content : " + activity.getTitle() +" by contentID :" + activity.getToolContentID()); - contentManager.importToolContent(newContent.getToolContentId(),toolPath); + contentManager.importToolContent(newContent.getToolContentId(),importer.getUserId(),toolPath); log.debug("Tool content import success."); } @@ -435,84 +445,89 @@ } } - public Object importToolContent(String toolContentPath,IToolContentHandler toolContentHandler) throws ImportToolContentException{ + public Object importToolContent(String toolContentPath, IToolContentHandler toolContentHandler) throws ImportToolContentException{ Object toolPOJO = null; // change xml to Tool POJO XStream toolXml = new XStream(); Converter c = toolXml.getConverterLookup().defaultConverter(); - //create proxy class - FileInvocationHandler handler = new FileInvocationHandler(c); - handler.setFileHandleClassList(fileHandleClassList); - Converter myc = (Converter) Proxy.newProxyInstance(c.getClass().getClassLoader(),new Class[]{Converter.class},handler); - //registry to new proxy convert to XStream - toolXml.registerConverter(myc); - + FileInvocationHandler handler = null; + if(!fileHandleClassList.isEmpty()){ + //create proxy class + handler = new FileInvocationHandler(c); + handler.setFileHandleClassList(fileHandleClassList); + Converter myc = (Converter) Proxy.newProxyInstance(c.getClass().getClassLoader(),new Class[]{Converter.class},handler); + //registry to new proxy convert to XStream + toolXml.registerConverter(myc); + } + List valueList = null; try { Reader toolFile = new FileReader(new File(FileUtil.getFullPath(toolContentPath,TOOL_FILE_NAME))); toolPOJO = toolXml.fromXML(toolFile); //upload file node if has - valueList = handler.getFileNodes(); - for(ValueInfo fileNode:valueList){ - - Long uuid = NumberUtils.createLong(BeanUtils.getProperty(fileNode.instance,fileNode.name.uuidFieldName)); - Long version = null; - //optional - try{ - version = NumberUtils.createLong(BeanUtils.getProperty(fileNode.instance,fileNode.name.versionFieldName)); - } catch (Exception e ) { - log.debug("No method for version:" + fileNode.instance); + if(handler != null){ + valueList = handler.getFileNodes(); + for(ValueInfo fileNode:valueList){ + + Long uuid = NumberUtils.createLong(BeanUtils.getProperty(fileNode.instance,fileNode.name.uuidFieldName)); + Long version = null; + //optional + try{ + version = NumberUtils.createLong(BeanUtils.getProperty(fileNode.instance,fileNode.name.versionFieldName)); + } catch (Exception e ) { + log.debug("No method for version:" + fileNode.instance); + } + + //according to upload rule: the file name will be uuid. + String realFileName = uuid.toString(); + String fullFileName = FileUtil.getFullPath(toolContentPath,realFileName); + log.debug("Tool attachement files/packages are going to upload to repository " + fullFileName); + + //to check if the file is package (with extension name ".zip") or single file (no extension name). + File file = new File(fullFileName); + boolean isPackage = false; + if(!file.exists()){ + file = new File(fullFileName+EXPORT_TOOLCONTNET_ZIP_SUFFIX); + realFileName = realFileName + EXPORT_TOOLCONTNET_ZIP_SUFFIX; + isPackage = true; + //if this file is norpackage neither single file, throw exception. + if(!file.exists()) + throw new ImportToolContentException("Content attached file/package can not be found: " + fullFileName + "(.zip)"); + } + + //more fields values for Repository upload use + String fileName = BeanUtils.getProperty(fileNode.instance,fileNode.name.fileNameFieldName); + String fileProperty = BeanUtils.getProperty(fileNode.instance,fileNode.name.filePropertyFieldName); + //optional fields + String mimeType = null; + try { + mimeType = BeanUtils.getProperty(fileNode.instance,fileNode.name.mimeTypeFieldName); + } catch (Exception e ) { + log.debug("No method for mimeType:" + fileNode.instance); + } + String initalItem = null; + try { + initalItem = BeanUtils.getProperty(fileNode.instance,fileNode.name.initalItemFieldName); + } catch (Exception e ) { + log.debug("No method for initial item:" + fileNode.instance); + } + + InputStream is = new FileInputStream(file); + //upload to repository: file or pacakge + NodeKey key; + if(!isPackage) + key = toolContentHandler.uploadFile(is,fileName,mimeType,fileProperty); + else{ + String packageDirectory = ZipFileUtil.expandZip(is, realFileName); + key = toolContentHandler.uploadPackage(packageDirectory,initalItem); + } + + //refresh file node Uuid and Version value to latest. + BeanUtils.setProperty(fileNode.instance,fileNode.name.uuidFieldName,key.getUuid()); + BeanUtils.setProperty(fileNode.instance,fileNode.name.versionFieldName,key.getVersion()); } - - //according to upload rule: the file name will be uuid. - String realFileName = uuid.toString(); - String fullFileName = FileUtil.getFullPath(toolContentPath,realFileName); - log.debug("Tool attachement files/packages are going to upload to repository " + fullFileName); - - //to check if the file is package (with extension name ".zip") or single file (no extension name). - File file = new File(fullFileName); - boolean isPackage = false; - if(!file.exists()){ - file = new File(fullFileName+EXPORT_TOOLCONTNET_ZIP_SUFFIX); - realFileName = realFileName + EXPORT_TOOLCONTNET_ZIP_SUFFIX; - isPackage = true; - //if this file is norpackage neither single file, throw exception. - if(!file.exists()) - throw new ImportToolContentException("Content attached file/package can not be found: " + fullFileName + "(.zip)"); - } - - //more fields values for Repository upload use - String fileName = BeanUtils.getProperty(fileNode.instance,fileNode.name.fileNameFieldName); - String fileProperty = BeanUtils.getProperty(fileNode.instance,fileNode.name.filePropertyFieldName); - //optional fields - String mimeType = null; - try { - mimeType = BeanUtils.getProperty(fileNode.instance,fileNode.name.mimeTypeFieldName); - } catch (Exception e ) { - log.debug("No method for mimeType:" + fileNode.instance); - } - String initalItem = null; - try { - initalItem = BeanUtils.getProperty(fileNode.instance,fileNode.name.initalItemFieldName); - } catch (Exception e ) { - log.debug("No method for initial item:" + fileNode.instance); - } - - InputStream is = new FileInputStream(file); - //upload to repository: file or pacakge - NodeKey key; - if(!isPackage) - key = toolContentHandler.uploadFile(is,fileName,mimeType,fileProperty); - else{ - String packageDirectory = ZipFileUtil.expandZip(is, realFileName); - key = toolContentHandler.uploadPackage(packageDirectory,initalItem); - } - - //refresh file node Uuid and Version value to latest. - BeanUtils.setProperty(fileNode.instance,fileNode.name.uuidFieldName,key.getUuid()); - BeanUtils.setProperty(fileNode.instance,fileNode.name.versionFieldName,key.getVersion()); } } catch (FileNotFoundException e) { throw new ImportToolContentException(e); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java,v diff -u -r1.5 -r1.6 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java 1 Jun 2006 06:55:02 -0000 1.5 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java 6 Jun 2006 04:08:57 -0000 1.6 @@ -79,8 +79,9 @@ void registerFileClassForImport(String fileNodeClassName, String fileUuidFieldName, String fileVersionFieldName, String fileNameFieldName, String filePropertyFieldName, String mimeTypeFieldName, String initialItemFieldName); - + void importLearningDesign(String learningDesignPath,User importer, Integer workspaceFolderUid) throws ImportToolContentException; - Object importToolContent(String toolContentPath,IToolContentHandler toolContentHandler) throws ImportToolContentException; + Object importToolContent(String toolContentPath, IToolContentHandler toolContentHandler) + throws ImportToolContentException; } Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java,v diff -u -r1.12 -r1.13 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java 2 Jun 2006 05:51:31 -0000 1.12 +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java 6 Jun 2006 04:08:57 -0000 1.13 @@ -111,7 +111,7 @@ * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentId, String toolContentPath) + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java,v diff -u -r1.14 -r1.15 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 2 Jun 2006 06:01:02 -0000 1.14 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 6 Jun 2006 04:03:33 -0000 1.15 @@ -248,7 +248,7 @@ * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { } 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.49 -r1.50 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 2 Jun 2006 06:04:04 -0000 1.49 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 6 Jun 2006 04:04:04 -0000 1.50 @@ -602,7 +602,7 @@ * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { } 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.63 -r1.64 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 2 Jun 2006 06:04:32 -0000 1.63 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 6 Jun 2006 04:04:28 -0000 1.64 @@ -1516,7 +1516,7 @@ * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { } 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.53 -r1.54 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 2 Jun 2006 06:05:21 -0000 1.53 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 6 Jun 2006 04:04:58 -0000 1.54 @@ -1317,7 +1317,7 @@ * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) 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.9 -r1.10 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml 29 May 2006 07:15:17 -0000 1.9 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml 6 Jun 2006 04:05:17 -0000 1.10 @@ -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.32 -r1.33 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 2 Jun 2006 05:58:16 -0000 1.32 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 6 Jun 2006 04:05:17 -0000 1.33 @@ -80,6 +80,8 @@ import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser; import org.lamsfoundation.lams.tool.rsrc.util.ResourceToolContentHandler; import org.lamsfoundation.lams.tool.service.ILamsToolService; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.util.zipfile.ZipFileUtil; @@ -109,6 +111,7 @@ private ILamsToolService toolService; private ILearnerService learnerService; private IAuditService auditService; + private IUserManagementService userManagementService; private IExportToolContentService exportContentService; public IVersionedNode getFileNode(Long itemUid, String relPathString) throws ResourceApplicationException { @@ -756,20 +759,37 @@ } - public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { try { - exportContentService.registerFileClassForImport("org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment" + exportContentService.registerFileClassForImport(ResourceAttachment.class.getName() ,"fileUuid","fileVersionId","fileName","fileType",null,null); - exportContentService.registerFileClassForImport("org.lamsfoundation.lams.tool.rsrc.model.ResourceItem" + exportContentService.registerFileClassForImport(ResourceItem.class.getName() ,"fileUuid","fileVersionId","fileName","fileType",null,"initialItem"); - Object toolPOJO = exportContentService.importToolContent(toolContentPath,resourceToolContentHandler); + + Object toolPOJO = exportContentService.importToolContent(toolContentPath,newUserUid, resourceToolContentHandler); if(!(toolPOJO instanceof Resource)) throw new ImportToolContentException("Import Share resources tool content failed. Deserialized object is " + toolPOJO); Resource toolContentObj = (Resource) toolPOJO; // reset it to new toolContentId toolContentObj.setContentId(toolContentId); + ResourceUser user = resourceUserDao.getUserByUserID(new Long(newUserUid.longValue())); + if(user == null){ + user = new ResourceUser(); + UserDTO sysUser = userManagementService.getUserById(newUserUid).getUserDTO(); + user.setFirstName(sysUser.getFirstName()); + user.setLastName(sysUser.getLastName()); + user.setLoginName(sysUser.getLogin()); + user.setUserId(new Long(newUserUid.longValue())); + } + toolContentObj.setCreatedBy(user); + + //reset all resourceItem createBy user + Set items = toolContentObj.getResourceItems(); + for(ResourceItem item:items){ + item.setCreateBy(user); + } resourceDao.saveObject(toolContentObj); } catch (ImportToolContentException e) { throw new ToolException(e); @@ -895,5 +915,15 @@ } + public IUserManagementService getUserManagementService() { + return userManagementService; + } + + public void setUserManagementService(IUserManagementService userManagementService) { + this.userManagementService = userManagementService; + } + + + } 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.24 -r1.25 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 2 Jun 2006 06:08:31 -0000 1.24 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 6 Jun 2006 04:05:41 -0000 1.25 @@ -896,7 +896,7 @@ * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { } /* ===============Methods implemented from ToolSessionManager =============== */ 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.46 -r1.47 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 2 Jun 2006 06:09:20 -0000 1.46 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 6 Jun 2006 04:07:19 -0000 1.47 @@ -30,9 +30,11 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; @@ -240,12 +242,12 @@ } } - public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { try { - exportContentService.registerFileClassForImport("org.lamsfoundation.lams.tool.sbmt.InstructionFiles", - "uuID","versionID","name","type",null,null); - Object toolPOJO = exportContentService.importToolContent(toolContentPath,sbmtToolContentHandler); + exportContentService.registerFileClassForImport(InstructionFiles.class.getName(),"uuID","versionID","name","type",null,null); + + Object toolPOJO = exportContentService.importToolContent(toolContentPath,newUserUid,sbmtToolContentHandler); if(!(toolPOJO instanceof SubmitFilesContent)) throw new ImportToolContentException("Import Submit tool content failed. Deserialized object is " + toolPOJO); SubmitFilesContent toolContentObj = (SubmitFilesContent) toolPOJO; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v diff -u -r1.36 -r1.37 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 2 Jun 2006 06:10:05 -0000 1.36 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 6 Jun 2006 04:08:13 -0000 1.37 @@ -1561,7 +1561,7 @@ * for the content. * @throws ToolException if any other error occurs */ - public void importToolContent(Long toolContentId, String toolContentPath) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath) throws ToolException { }