Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rb9bdd76df0379b731b11f931d68ce0f8bdbd9c89 -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
diff -u -r016db2a9e2faacd0b9d20dd874571756eea79a14 -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision 016db2a9e2faacd0b9d20dd874571756eea79a14)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
@@ -290,17 +290,6 @@
if (keyExists(table, WDDXTAGS.LAST_MODIFIED_DATE))
learningDesign.setLastModifiedDateTime(WDDXProcessor.convertToDate(table,WDDXTAGS.LAST_MODIFIED_DATE));
- // not required at authoring time.
- if (keyExists(table, WDDXTAGS.LESSON_ORG_NAME))
- learningDesign.setLessonOrgName(WDDXProcessor.convertToString(table,WDDXTAGS.LESSON_ORG_NAME));
- if (keyExists(table, WDDXTAGS.LESSON_NAME))
- learningDesign.setLessonName(WDDXProcessor.convertToString(table,WDDXTAGS.LESSON_NAME));
- if (keyExists(table, WDDXTAGS.LESSON_START_DATETIME))
- learningDesign.setLessonStartDateTime(WDDXProcessor.convertToDate(table,WDDXTAGS.LESSON_START_DATETIME));
- if (keyExists(table, WDDXTAGS.LESSON_ID))
- learningDesign.setLessonID(WDDXProcessor.convertToLong(table,WDDXTAGS.LESSON_ID));
- if (keyExists(table, WDDXTAGS.LESSON_ORG_ID))
- learningDesign.setLessonOrgID(WDDXProcessor.convertToLong(table,WDDXTAGS.LESSON_ORG_ID));
if (keyExists(table, WDDXTAGS.DURATION))
learningDesign.setDuration(WDDXProcessor.convertToLong(table,WDDXTAGS.DURATION));
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u -r01a4035d52575ebe0a8467b4e589998196353962 -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml (.../LearningDesign.hbm.xml) (revision 01a4035d52575ebe0a8467b4e589998196353962)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml (.../LearningDesign.hbm.xml) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
@@ -134,22 +134,6 @@
@hibernate.property column ="license_text"
-
-
- @hibernate.property column ="lesson_org_id"
-
-
- @hibernate.property column ="lesson_org_name"
-
-
- @hibernate.property column ="lesson_id"
-
-
- @hibernate.property column ="lesson_name"
-
-
- @hibernate.property column ="lesson_start_date_time"
-
@hibernate.property column ="last_modified_date_time"
Index: lams_common/db/model/lams_11.clay
===================================================================
diff -u -ra07f122478a2eb187e7448fbfe41a738504e3f26 -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f
--- lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision a07f122478a2eb187e7448fbfe41a738504e3f26)
+++ lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
@@ -1000,58 +1000,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -5019,8 +4973,8 @@
-
+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -ra07f122478a2eb187e7448fbfe41a738504e3f26 -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision a07f122478a2eb187e7448fbfe41a738504e3f26)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
@@ -349,14 +349,8 @@
, duration BIGINT(38)
, license_id BIGINT(20)
, license_text TEXT
- , lesson_org_id BIGINT(20)
- , lesson_org_name VARCHAR(255)
- , lesson_id BIGINT(20)
- , lesson_start_date_time DATETIME
- , lesson_name VARCHAR(255)
, last_modified_date_time DATETIME
, PRIMARY KEY (learning_design_id)
- , INDEX (original_learning_design_id)
, INDEX (user_id)
, CONSTRAINT FK_lams_learning_design_3 FOREIGN KEY (user_id)
REFERENCES lams_user (user_id)
@@ -370,6 +364,7 @@
, CONSTRAINT FK_lams_learning_design_6 FOREIGN KEY (copy_type_id)
REFERENCES lams_copy_type (copy_type_id)
)TYPE=InnoDB;
+CREATE INDEX idx_design_parent_id ON lams_learning_design (original_learning_design_id ASC);
CREATE INDEX idx_design_first_act ON lams_learning_design (first_activity_id ASC);
CREATE TABLE lams_grouping (
Fisheye: Tag 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f refers to a dead (removed) revision in file `lams_common/db/sql/lams_11.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
===================================================================
diff -u -r57c67cb560b7623b59a2fa25090641743141a09d -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 57c67cb560b7623b59a2fa25090641743141a09d)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
@@ -36,7 +36,6 @@
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.lamsfoundation.lams.learningdesign.dto.DesignDetailDTO;
-import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO;
import org.lamsfoundation.lams.usermanagement.User;
import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
import org.lamsfoundation.lams.workspace.dto.FolderContentDTO;
@@ -49,6 +48,8 @@
*/
public class LearningDesign implements Serializable {
+ private static final long serialVersionUID = -5695987114641062118L;
+
/** Represents a single LearningDesign object in the WDDXPacket */
public static final String DESIGN_OBJECT = "LearningDesign";
@@ -133,21 +134,6 @@
/** nullable persistent field */
private License license;
- /** nullable persistent field*/
- private Long lessonOrgID;
-
- /** nullable persistent field*/
- private String lessonOrgName;
-
- /** nullable persistent field*/
- private Long lessonID;
-
- /** nullable persistent field*/
- private String lessonName;
-
- /** nullable persistent field*/
- private Date lessonStartDateTime;
-
/** persistent field*/
private Date lastModifiedDateTime;
@@ -484,36 +470,6 @@
public void setLicense(License license) {
this.license = license;
}
- public Long getLessonID() {
- return lessonID;
- }
- public void setLessonID(Long lessonID) {
- this.lessonID = lessonID;
- }
- public String getLessonName() {
- return lessonName;
- }
- public void setLessonName(String lessonName) {
- this.lessonName = lessonName;
- }
- public Long getLessonOrgID() {
- return lessonOrgID;
- }
- public void setLessonOrgID(Long lessonOrgID) {
- this.lessonOrgID = lessonOrgID;
- }
- public String getLessonOrgName() {
- return lessonOrgName;
- }
- public void setLessonOrgName(String lessonOrgName) {
- this.lessonOrgName = lessonOrgName;
- }
- public Date getLessonStartDateTime() {
- return lessonStartDateTime;
- }
- public void setLessonStartDateTime(Date lessonStartDateTime) {
- this.lessonStartDateTime = lessonStartDateTime;
- }
public Date getLastModifiedDateTime() {
return lastModifiedDateTime;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
===================================================================
diff -u -rf54a6e1be7de8bc955a21a6d2f804070e353079f -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision f54a6e1be7de8bc955a21a6d2f804070e353079f)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
@@ -65,11 +65,6 @@
private Long duration;
private String licenseText;
private Long licenseID;
- private Long lessonOrgID;
- private String lessonOrgName;
- private Long lessonID;
- private String lessonName;
- private Date lessonStartDateTime;
private Date lastModifiedDateTime;
private String offlineInstructions;
private String onlineInstructions;
@@ -103,11 +98,6 @@
Long duration,
String licenseText,
Long licenseID,
- Long lessonOrgID,
- String lessonOrgName,
- Long lessonID,
- String lessonName,
- Date lessonStartDateTime,
Date lastModifiedDateTime,
String offlineInstructions,
String onlineInstructions) {
@@ -134,11 +124,6 @@
this.duration = duration;
this.licenseText = licenseText;
this.licenseID = licenseID;
- this.lessonOrgID = lessonOrgID;
- this.lessonOrgName = lessonOrgName;
- this.lessonID = lessonID;
- this.lessonName = lessonName;
- this.lessonStartDateTime = lessonStartDateTime;
this.lastModifiedDateTime = lastModifiedDateTime;
this.groupings = new ArrayList();
this.activities = new ArrayList();
@@ -187,12 +172,6 @@
learningDesign.getLicense().getLicenseID():
null;
- this.lessonOrgID = learningDesign.getLessonOrgID();
-
- this.lessonOrgName = learningDesign.getLessonOrgName();
- this.lessonID = learningDesign.getLessonID();
- this.lessonName = learningDesign.getLessonName();
- this.lessonStartDateTime = learningDesign.getLessonStartDateTime();
this.lastModifiedDateTime = learningDesign.getLastModifiedDateTime();
this.groupings = populateGroupings(learningDesign,activityDAO);
this.activities = populateActivities(learningDesign);
@@ -270,41 +249,6 @@
return learningDesignUIID;
}
/**
- * @return Returns the lessonID.
- */
- public Long getLessonID() {
- //return lessonID!=null?lessonID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
- return lessonID;
- }
- /**
- * @return Returns the lessonName.
- */
- public String getLessonName() {
- //return lessonName!=null?lessonName:WDDXTAGS.STRING_NULL_VALUE;
- return lessonName;
- }
- /**
- * @return Returns the lessonOrgID.
- */
- public Long getLessonOrgID() {
- //return lessonOrgID!=null?lessonOrgID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG;
- return lessonOrgID;
- }
- /**
- * @return Returns the lessonOrgName.
- */
- public String getLessonOrgName() {
- //return lessonOrgName!=null?lessonOrgName:WDDXTAGS.STRING_NULL_VALUE;
- return lessonOrgName;
- }
- /**
- * @return Returns the lessonStartDateTime.
- */
- public Date getLessonStartDateTime() {
- //return lessonStartDateTime!=null?lessonStartDateTime:WDDXTAGS.DATE_NULL_VALUE;
- return lessonStartDateTime;
- }
- /**
* @return Returns the licenseID.
*/
public Long getLicenseID() {
@@ -512,41 +456,6 @@
this.learningDesignUIID = learningDesignUIID;
}
/**
- * @param lessonID The lessonID to set.
- */
- public void setLessonID(Long lessonID) {
- if(!lessonID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
- this.lessonID = lessonID;
- }
- /**
- * @param lessonName The lessonName to set.
- */
- public void setLessonName(String lessonName) {
- if(!lessonName.equals(WDDXTAGS.STRING_NULL_VALUE))
- this.lessonName = lessonName;
- }
- /**
- * @param lessonOrgID The lessonOrgID to set.
- */
- public void setLessonOrgID(Long lessonOrgID) {
- if(!lessonOrgID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
- this.lessonOrgID = lessonOrgID;
- }
- /**
- * @param lessonOrgName The lessonOrgName to set.
- */
- public void setLessonOrgName(String lessonOrgName) {
- if(!lessonOrgName.equals(WDDXTAGS.STRING_NULL_VALUE))
- this.lessonOrgName = lessonOrgName;
- }
- /**
- * @param lessonStartDateTime The lessonStartDateTime to set.
- */
- public void setLessonStartDateTime(Date lessonStartDateTime) {
- if(!lessonStartDateTime.equals(WDDXTAGS.DATE_NULL_VALUE))
- this.lessonStartDateTime = lessonStartDateTime;
- }
- /**
* @param licenseID The licenseID to set.
*/
public void setLicenseID(Long licenseID) {
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -rc21079bc26cf334c99c5194da3ae223f7bfec9bb -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision c21079bc26cf334c99c5194da3ae223f7bfec9bb)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
@@ -854,12 +854,6 @@
ld.setLicenseText(dto.getLicenseText());
}
- ld.setLessonOrgID(dto.getLessonOrgID());
-
- ld.setLessonOrgName(dto.getLessonOrgName());
- ld.setLessonID(dto.getLessonID());
- ld.setLessonName(dto.getLessonName());
- ld.setLessonStartDateTime(dto.getLessonStartDateTime());
ld.setLastModifiedDateTime(dto.getLastModifiedDateTime());
//set learning design to transition.
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LD102Importer.java
===================================================================
diff -u -r3b8c21e084c7a36446794d92e6ad0757b3a03ca2 -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LD102Importer.java (.../LD102Importer.java) (revision 3b8c21e084c7a36446794d92e6ad0757b3a03ca2)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LD102Importer.java (.../LD102Importer.java) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
@@ -515,11 +515,6 @@
ld.setDuration(null);
ld.setLicenseText(null);
ld.setLicense(null);
- ld.setLessonOrgID(null);
- ld.setLessonOrgName(null);
- ld.setLessonID(null);
- ld.setLessonName(null);
- ld.setLessonStartDateTime(null);
ldInProgress = ld;
}
Index: lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
===================================================================
diff -u -r28cb89c7a2c83239db0370b3911eee3195de4f23 -r28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f
--- lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java (.../WDDXTAGS.java) (revision 28cb89c7a2c83239db0370b3911eee3195de4f23)
+++ lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java (.../WDDXTAGS.java) (revision 28143b7c8f1bf58ef463c6ddc7ab2c41c6df030f)
@@ -166,13 +166,6 @@
/**ComplexActivity specific tags */
public static final String CHILD_ACTIVITIES ="childActivities";
- /** Lesson Specific Tags */
- public static final String LESSON_ID = "lessonID";
- public static final String LESSON_ORG_ID = "lessonOrgID";
- public static final String LESSON_ORG_NAME = "lessonOrgName";
- public static final String LESSON_NAME = "lessonName";
- public static final String LESSON_START_DATETIME = "lessonStartDateTime";
-
/** Crash Dump Specific Tags */
public static final String CRASH_DUMP_BATCH="crashDataBatch";