Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rd1d6cf4ec5a79ec9371fdfda64ce634483d2a325 -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98
Binary files differ
Index: lams_central/build.xml
===================================================================
diff -u -r1039156a504467d97c885f61b95c3dde316eb1a5 -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98
--- lams_central/build.xml (.../build.xml) (revision 1039156a504467d97c885f61b95c3dde316eb1a5)
+++ lams_central/build.xml (.../build.xml) (revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
@@ -136,6 +136,7 @@
+
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentServlet.java
===================================================================
diff -u -r67d223336fe0ab1cf22b8102c40ec3805aafe6e2 -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentServlet.java (.../ImportToolContentServlet.java) (revision 67d223336fe0ab1cf22b8102c40ec3805aafe6e2)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentServlet.java (.../ImportToolContentServlet.java) (revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
@@ -82,12 +82,10 @@
FileItem file = null;
Map params = new HashMap();
- String filename;
+ String filename = null;
String uploadPath = FileUtil.createTempDirectory("_uploaded_learningdesing");
- String ldPath = FileUtil.getFullPath(uploadPath,"learningdesign");
- FileUtil.createDirectory(ldPath);
-
+
DiskFileUpload fu = new DiskFileUpload();
// maximum size that will be stored in memory
fu.setSizeThreshold(4096);
@@ -113,7 +111,7 @@
return;
}
// write the file
- ZipFileUtil.expandZip(file.getInputStream(),ldPath);
+ String ldPath = ZipFileUtil.expandZip(file.getInputStream(),filename);
IExportToolContentService service = getExportService();
service.importLearningDesign(ldPath,user,workspaceFolderUid);
} catch (Exception e) {
Index: lams_central/web/importToolContent/import.jsp
===================================================================
diff -u -raf5a6d9874421d5f5bb335259ae58b23116b0bf5 -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98
--- lams_central/web/importToolContent/import.jsp (.../import.jsp) (revision af5a6d9874421d5f5bb335259ae58b23116b0bf5)
+++ lams_central/web/importToolContent/import.jsp (.../import.jsp) (revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
@@ -1,4 +1,5 @@
<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-core" prefix="c"%>
@@ -13,7 +14,7 @@
Upload Learning Design
- " method="post" enctype="multipart/form-data">
Learning Design zip file:
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r2544e101518962e76f9a225bf2ba77eb1422b64c -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 2544e101518962e76f9a225bf2ba77eb1422b64c)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
@@ -602,7 +602,8 @@
* for the content.
* @throws ToolException if any other error occurs
*/
- public void importToolContent(Object toolContnetPOJO) throws ToolException {
+ public void importToolContent(String toolContentPath) throws ToolException {
+
}
/** @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long, java.lang.String, java.lang.Long) */
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r2544e101518962e76f9a225bf2ba77eb1422b64c -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 2544e101518962e76f9a225bf2ba77eb1422b64c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
@@ -1516,12 +1516,12 @@
* for the content.
* @throws ToolException if any other error occurs
*/
- public void importToolContent(Object toolContnetPOJO) throws ToolException {
+ public void importToolContent(String toolContentPath) 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.
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r2544e101518962e76f9a225bf2ba77eb1422b64c -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 2544e101518962e76f9a225bf2ba77eb1422b64c)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
@@ -1317,7 +1317,8 @@
* for the content.
* @throws ToolException if any other error occurs
*/
- public void importToolContent(Object toolContnetPOJO) throws ToolException {
+ public void importToolContent(String toolContentPath) throws ToolException {
+
}
/**
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -rc991c60f5a604ed7f71309d0ebe8971eea102642 -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision c991c60f5a604ed7f71309d0ebe8971eea102642)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
@@ -53,6 +53,7 @@
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.learningdesign.service.ImportToolContentException;
import org.lamsfoundation.lams.tool.ToolContentManager;
import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
import org.lamsfoundation.lams.tool.ToolSessionManager;
@@ -746,16 +747,26 @@
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.registerFileClassForExport("org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment","fileUuid","fileVersionId");
+ exportContentService.registerFileClassForExport("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 importToolContent(String toolContentPath) throws ToolException {
+
+ try {
+ exportContentService.registerFileClassForImport("org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment"
+ ,"fileUuid","fileVersionId","fileName","fileType",null,null);
+ exportContentService.registerFileClassForImport("org.lamsfoundation.lams.tool.rsrc.model.ResourceItem"
+ ,"fileUuid","fileVersionId","fileName","fileType",null,"initialItem");
+ Object toolPOJO = exportContentService.importToolContent(toolContentPath,resourceToolContentHandler);
+ } catch (ImportToolContentException e) {
+ throw new ToolException(e);
+ }
}
public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException {
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java
===================================================================
diff -u -r2544e101518962e76f9a225bf2ba77eb1422b64c -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 2544e101518962e76f9a225bf2ba77eb1422b64c)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
@@ -896,7 +896,8 @@
* for the content.
* @throws ToolException if any other error occurs
*/
- public void importToolContent(Object toolContnetPOJO) throws ToolException {
+ public void importToolContent(String toolContentPath) throws ToolException {
+
}
/* ===============Methods implemented from ToolSessionManager =============== */
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -rc991c60f5a604ed7f71309d0ebe8971eea102642 -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision c991c60f5a604ed7f71309d0ebe8971eea102642)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
@@ -58,6 +58,7 @@
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.learningdesign.service.ImportToolContentException;
import org.lamsfoundation.lams.tool.ToolContentManager;
import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
import org.lamsfoundation.lams.tool.ToolSessionManager;
@@ -223,7 +224,7 @@
* @throws ExportToolContentException
*/
public void exportToolContent(Long toolContentId , String toPath) throws ToolException, DataMissingException{
- exportContentService.registerFileHandleClass("org.lamsfoundation.lams.tool.sbmt.InstructionFiles","uuID","versionID");
+ exportContentService.registerFileClassForExport("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);
@@ -238,7 +239,16 @@
throw new ToolException(e);
}
}
- public void importToolContent(Object toolContnetPOJO) throws ToolException {
+
+ public void importToolContent(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);
+ } catch (ImportToolContentException e) {
+ throw new ToolException(e);
+ }
}
/*
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
diff -u -r7271b17e27d55c5a50ce986d22cc603064fd16b7 -r2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 7271b17e27d55c5a50ce986d22cc603064fd16b7)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 2c76f1a15b8cc50c586e9e35bdbd2f93454f7a98)
@@ -1561,7 +1561,8 @@
* for the content.
* @throws ToolException if any other error occurs
*/
- public void importToolContent(Object toolContnetPOJO) throws ToolException {
+ public void importToolContent(String toolContentPath) throws ToolException {
+
}
/**