Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rfa5eb10796d2b7d6bf2f15b0a96abac6b2fe47f1 -r0988ce4dfd3a003db77de92d7c158bdf548093ab
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
diff -u -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f -r0988ce4dfd3a003db77de92d7c158bdf548093ab
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision 0988ce4dfd3a003db77de92d7c158bdf548093ab)
@@ -293,6 +293,9 @@
if (keyExists(table, WDDXTAGS.DURATION))
learningDesign.setDuration(WDDXProcessor.convertToLong(table,WDDXTAGS.DURATION));
+ if (keyExists(table, WDDXTAGS.CONTENT_FOLDER_ID))
+ learningDesign.setContentFolderID(WDDXProcessor.convertToString(table, WDDXTAGS.CONTENT_FOLDER_ID));
+
if (keyExists(table, WDDXTAGS.USER_ID))
{
Integer userId = WDDXProcessor.convertToInteger(table,WDDXTAGS.USER_ID);
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -re21e46d35a751657ff3b63704419ad212747425e -r0988ce4dfd3a003db77de92d7c158bdf548093ab
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision e21e46d35a751657ff3b63704419ad212747425e)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 0988ce4dfd3a003db77de92d7c158bdf548093ab)
@@ -679,14 +679,14 @@
newUniqueContentFolderID = ((String) uuidGen.generate(null, null)).toLowerCase();
// directory pathname
- String dirPath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator + AuthoringConstants.LAMS_WWW_DIR + File.separator + AuthoringConstants.LAMS_WWW_SECURE_DIR + File.separator + newUniqueContentFolderID;
+ //String dirPath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator + AuthoringConstants.LAMS_WWW_DIR + File.separator + AuthoringConstants.LAMS_WWW_SECURE_DIR + File.separator + newUniqueContentFolderID;
// create new directory
- if(FileUtil.createDirectory(dirPath)){
+ //if(FileUtil.createDirectory(dirPath)){
flashMessage = new FlashMessage("createUniqueContentFolder", newUniqueContentFolderID);
- } else {
- throw new FileUtilException();
- }
+ //} else {
+ // throw new FileUtilException();
+ //}
return flashMessage.serializeMessage();
}
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f -r0988ce4dfd3a003db77de92d7c158bdf548093ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml (.../LearningDesign.hbm.xml) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml (.../LearningDesign.hbm.xml) (revision 0988ce4dfd3a003db77de92d7c158bdf548093ab)
@@ -146,6 +146,9 @@
@hibernate.property column="online_instructions" length="65535"
+
+ @hibernate.property column="content_folder_id" length="32"
+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r7697bd6b1da52d525246c6b28a2508d167b32a47 -r0988ce4dfd3a003db77de92d7c158bdf548093ab
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 7697bd6b1da52d525246c6b28a2508d167b32a47)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 0988ce4dfd3a003db77de92d7c158bdf548093ab)
@@ -346,6 +346,7 @@
, license_id BIGINT(20)
, license_text TEXT
, last_modified_date_time DATETIME
+ , content_folder_id VARCHAR(32)
, PRIMARY KEY (learning_design_id)
, INDEX (user_id)
, CONSTRAINT FK_lams_learning_design_3 FOREIGN KEY (user_id)
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
===================================================================
diff -u -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f -r0988ce4dfd3a003db77de92d7c158bdf548093ab
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 0988ce4dfd3a003db77de92d7c158bdf548093ab)
@@ -128,6 +128,9 @@
/** persistent field */
private Long duration;
+ /** persistent field */
+ private String contentFolderID;
+
/** nullable persistent field */
private String licenseText;
@@ -263,7 +266,8 @@
if ( setOriginalDesign )
newDesign.setOriginalLearningDesign(design);
- newDesign.setCopyTypeID(designCopyType);
+ newDesign.setCopyTypeID(designCopyType);
+ newDesign.setContentFolderID(design.getContentFolderID());
return newDesign;
}
@@ -489,7 +493,13 @@
public void setOnlineInstructions(String onlineInstructions) {
this.onlineInstructions = onlineInstructions;
}
-
+ public String getContentFolderID() {
+ return contentFolderID;
+ }
+ public void setContentFolderID(String contentFolderID){
+ this.contentFolderID = contentFolderID;
+ }
+
public DesignDetailDTO getDesignDetailDTO(){
return new DesignDetailDTO(this);
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java
===================================================================
diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r0988ce4dfd3a003db77de92d7c158bdf548093ab
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java (.../DesignDetailDTO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java (.../DesignDetailDTO.java) (revision 0988ce4dfd3a003db77de92d7c158bdf548093ab)
@@ -47,6 +47,7 @@
private String version;
private Long parentLearningDesignID;
private Integer workspaceFolderID;
+ private String contentFolderID;
public DesignDetailDTO(){
@@ -91,6 +92,7 @@
learningDesign.getOriginalLearningDesign().getLearningDesignId():
null;
this.workspaceFolderID = learningDesign.getWorkspaceFolder().getWorkspaceFolderId();
+ this.contentFolderID = learningDesign.getContentFolderID();
}
/**
* @return Returns the copyTypeID.
@@ -176,4 +178,11 @@
public Integer getWorkspaceFolderID() {
return workspaceFolderID;
}
+ /**
+ *
+ * @return Returns the contentFolderID
+ */
+ public String getContentFolderID() {
+ return contentFolderID;
+ }
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
===================================================================
diff -u -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f -r0988ce4dfd3a003db77de92d7c158bdf548093ab
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 0988ce4dfd3a003db77de92d7c158bdf548093ab)
@@ -66,6 +66,7 @@
private String licenseText;
private Long licenseID;
private Date lastModifiedDateTime;
+ private String contentFolderID;
private String offlineInstructions;
private String onlineInstructions;
@@ -154,6 +155,7 @@
this.helpText = learningDesign.getHelpText();
this.copyTypeID = learningDesign.getCopyTypeID();
+ this.contentFolderID = learningDesign.getContentFolderID();
this.createDateTime = learningDesign.getCreateDateTime();
this.version = learningDesign.getVersion();
@@ -176,7 +178,16 @@
this.groupings = populateGroupings(learningDesign,activityDAO);
this.activities = populateActivities(learningDesign);
this.transitions = populateTransitions(learningDesign);
+
}
+
+ /**
+ *
+ * @return Returns the contentFolderID
+ */
+ public String getContentFolderID() {
+ return contentFolderID;
+ }
/**
* @return Returns the copyTypeID.
@@ -386,7 +397,16 @@
public void setActivities(ArrayList activities) {
this.activities = activities;
}
+
/**
+ *
+ * @param contentFolderID The contentFolderID to set.
+ */
+ public void setContentFolderID(String contentFolderID) {
+ this.contentFolderID = contentFolderID;
+ }
+
+ /**
* @param copyTypeID The copyTypeID to set.
*/
public void setCopyTypeID(Integer copyTypeID) {
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -rfa5eb10796d2b7d6bf2f15b0a96abac6b2fe47f1 -r0988ce4dfd3a003db77de92d7c158bdf548093ab
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision fa5eb10796d2b7d6bf2f15b0a96abac6b2fe47f1)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 0988ce4dfd3a003db77de92d7c158bdf548093ab)
@@ -853,7 +853,8 @@
}
ld.setLastModifiedDateTime(dto.getLastModifiedDateTime());
-
+ ld.setContentFolderID(dto.getContentFolderID());
+
//set learning design to transition.
for(Transition trans:transList){
trans.setLearningDesign(ld);
Index: lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
===================================================================
diff -u -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f -r0988ce4dfd3a003db77de92d7c158bdf548093ab
--- lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java (.../WDDXTAGS.java) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
+++ lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java (.../WDDXTAGS.java) (revision 0988ce4dfd3a003db77de92d7c158bdf548093ab)
@@ -162,6 +162,7 @@
public static final String DURATION ="duration";
public static final String LICENCE_ID ="licenseID";
public static final String LICENSE_TEXT ="licenseText";
+ public static final String CONTENT_FOLDER_ID = "contentFolderID";
/**ComplexActivity specific tags */
public static final String CHILD_ACTIVITIES ="childActivities";