Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r70cf04183bd09ee740203e876fd31a317badcbca -r03392c988a23f5e9129967f8ae692488213632fe Binary files differ Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml =================================================================== diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml (.../Workspace.hbm.xml) (revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml (.../Workspace.hbm.xml) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -113,5 +113,23 @@ + + + + @hibernate.many-to-one + not-null="true" + lazy="false" + @hibernate.column name="def_run_seq_fld_id" + + + + Index: lams_common/db/model/lams_11.clay =================================================================== diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355) +++ lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -2208,6 +2208,19 @@ + + + + + + + + + + + + + @@ -2229,6 +2242,13 @@ + + + + + + + Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355) +++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -161,11 +161,15 @@ CREATE TABLE lams_workspace ( workspace_id BIGINT(20) NOT NULL AUTO_INCREMENT , root_folder_id BIGINT(20) + , def_run_seq_fld_id BIGINT(20) , name VARCHAR(255) , PRIMARY KEY (workspace_id) , INDEX (root_folder_id) , CONSTRAINT FK_lams_workspace_1 FOREIGN KEY (root_folder_id) REFERENCES lams_workspace_folder (workspace_folder_id) ON DELETE NO ACTION ON UPDATE NO ACTION + , INDEX (def_run_seq_fld_id) + , CONSTRAINT FK_wkspce_default_run FOREIGN KEY (def_run_seq_fld_id) + REFERENCES lams_workspace_folder (workspace_folder_id) )TYPE=InnoDB; CREATE TABLE lams_organisation ( Index: lams_common/db/sql/insert_users.sql =================================================================== diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/db/sql/insert_users.sql (.../insert_users.sql) (revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355) +++ lams_common/db/sql/insert_users.sql (.../insert_users.sql) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -18,8 +18,8 @@ insert into lams_workspace (workspace_id, root_folder_id, name) values(1,1,'ROOT'); -insert into lams_workspace (workspace_id, root_folder_id, name) values(2,2,'Developers Playpen'); -insert into lams_workspace (workspace_id, root_folder_id, name) values(3,3,'MATH111'); +insert into lams_workspace (workspace_id, root_folder_id, name, def_run_seq_fld_id) values(2,2,'Developers Playpen',21); +insert into lams_workspace (workspace_id, root_folder_id, name, def_run_seq_fld_id) values(3,3,'MATH111',22); insert into lams_workspace (workspace_id, root_folder_id, name) values(4,4,'Mary Morgan'); insert into lams_workspace (workspace_id, root_folder_id, name) values(5,5,'One Test'); insert into lams_workspace (workspace_id, root_folder_id, name) values(6,6,'Two Test'); @@ -33,9 +33,15 @@ values(2,1,'Developers Playpen',2,1,'20041223','20041223',1); insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(21,2,'Lesson Sequence Folder',2,1,'20041223','20041223',2); + +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) values(3,1,'MATH111',3,1,'20041223','20041223',1); insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(22,3,'Lesson Sequence Folder',3,1,'20041223','20041223',2); + +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) values(4,null,'Mary Morgan Folder',4,4,'20041223','20041223',1); insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -rd665bfd982e0a9e11818f0ed08c265d9c36adedb -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision d665bfd982e0a9e11818f0ed08c265d9c36adedb) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -108,6 +108,8 @@ + + Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java =================================================================== diff -u -r3f60ecf7d3a92231a1089191ae75c68bc66e9595 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 3f60ecf7d3a92231a1089191ae75c68bc66e9595) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -796,9 +796,9 @@ /** Get the authoring DTO for this activity. Overidden by ComplexActivity. */ - public Set getAuthoringActivityDTOSet() + public Set getAuthoringActivityDTOSet() { - HashSet dtoSet = new HashSet(); + HashSet dtoSet = new HashSet(); dtoSet.add(new AuthoringActivityDTO(this)); return dtoSet; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java (.../ComplexActivity.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java (.../ComplexActivity.java) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -180,9 +180,9 @@ } - public Set getAuthoringActivityDTOSet() + public Set getAuthoringActivityDTOSet() { - HashSet dtoSet = new HashSet(); + HashSet dtoSet = new HashSet(); dtoSet.add(new AuthoringActivityDTO(this)); //add parent activity //add the DTO for all child activities Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -535,10 +535,6 @@ this.onlineInstructions = onlineInstructions; } - - public LearningDesignDTO getLearningDesignDTO(){ - return new LearningDesignDTO(this); - } public DesignDetailDTO getDesignDetailDTO(){ return new DesignDetailDTO(this); } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -223,12 +223,12 @@ +". Falling back to a class grouping."); } - if ( learners == null ) { + if ( learners == null || learners.isNull()) { LessonClass lessonClass = lesson.getLessonClass(); learners = this.getGroupFor(learner, lessonClass); } - if ( learners != null ) { + if ( learners != null && ! learners.isNull() ) { session = new GroupedToolSession(this, now, ToolSession.STARTED_STATE, Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java (.../IActivityDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java (.../IActivityDAO.java) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -90,6 +90,13 @@ public List getActivitiesByLearningDesignId(Long learningDesignId); /** + * Get all the grouping activities for this learning design. + * @param learningDesignId The id of the learningDesign + * @return List of all the activities + */ + public List getGroupingActivitiesByLearningDesignId(Long learningDesignId); + + /** * Returns a list of activities associated with the LearningLibrary. * It only returns the template activities and not all activities * with learning_library_id =libraryID. Template activity is one which Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (.../ActivityDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (.../ActivityDAO.java) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -52,6 +52,9 @@ private static final String FIND_BY_LEARNING_DESIGN_ID = "from " + TABLENAME + " in class " + Activity.class.getName() + " where learning_design_id=?" ; + private static final String FIND_GROUPINGACTIVITY_TYPE_BY_LEARNING_DESIGN_ID = "from " + TABLENAME + + " in class " + GroupingActivity.class.getName() + + " where learning_design_id=?"; private static final String FIND_BY_UI_ID ="from " + TABLENAME + " in class " + Activity.class.getName() + " where activity_ui_id=?" + " AND " + " learning_design_id=?" ; @@ -130,6 +133,15 @@ return this.getHibernateTemplate().find(FIND_BY_LEARNING_DESIGN_ID,learningDesignId); } + /** + * Get all the grouping activities for this learning design. + * @param learningDesignId The id of the learningDesign + * @return List of GroupingActivity objects + */ + public List getGroupingActivitiesByLearningDesignId(Long learningDesignId) { + return this.getHibernateTemplate().find(FIND_GROUPINGACTIVITY_TYPE_BY_LEARNING_DESIGN_ID,learningDesignId); + } + /* * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#insertActivity(org.lamsfoundation.lams.learningdesign.Activity) */ Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -27,13 +27,15 @@ import java.util.ArrayList; import java.util.Date; import java.util.Iterator; +import java.util.List; import java.util.Set; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.Grouping; import org.lamsfoundation.lams.learningdesign.GroupingActivity; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.Transition; +import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO; import org.lamsfoundation.lams.util.wddx.WDDXTAGS; /** @@ -140,7 +142,7 @@ this.activities = new ArrayList(); this.transitions = new ArrayList(); } - public LearningDesignDTO(LearningDesign learningDesign){ + public LearningDesignDTO(LearningDesign learningDesign, ActivityDAO activityDAO){ this.learningDesignID = learningDesign.getLearningDesignId(); this.learningDesignUIID = learningDesign.getLearningDesignUIID(); this.description = learningDesign.getDescription(); @@ -190,7 +192,7 @@ this.lessonName = learningDesign.getLessonName(); this.lessonStartDateTime = learningDesign.getLessonStartDateTime(); this.lastModifiedDateTime = learningDesign.getLastModifiedDateTime(); - this.groupings = populateGroupings(learningDesign); + this.groupings = populateGroupings(learningDesign,activityDAO); this.activities = populateActivities(learningDesign); this.transitions = populateTransitions(learningDesign); } @@ -382,52 +384,36 @@ * activities in the learning design and for all grouping activities, it will * then retrieve the Grouping object which was created by the GroupingActivity. * @param design + * @param groupingDAO DAO to reget grouping objects due to the hibernate cglib casting problems. * @return ArrayList the array of groupingDTOs */ - public ArrayList populateGroupings(LearningDesign design) + public ArrayList populateGroupings(LearningDesign design, ActivityDAO activityDAO) { - ArrayList groupingList = new ArrayList(); - //go through list of activities, get the createGrouping objects - Iterator parentIterator = design.getParentActivities().iterator(); + // Unfortunately, we can't just go through all the activities via design.getParentActivities() + // as the activities returned won't cast to GroupingActivity, so we would + // have to reget every activity to get the right type. So the easiest way + // is to get them all in a list directly via a HQL call. + ArrayList groupingList = new ArrayList(); + List groupingActivities = activityDAO.getGroupingActivitiesByLearningDesignId(design.getLearningDesignId()); + Iterator parentIterator = groupingActivities.iterator(); while (parentIterator.hasNext()) { - Activity object = (Activity) parentIterator.next(); - if(object.isGroupingActivity()){ - GroupingActivity groupingActivity = (GroupingActivity)object; - Grouping grouping = groupingActivity.getCreateGrouping(); - groupingList.add(grouping.getGroupingDTO()); - } + GroupingActivity groupingActivity = (GroupingActivity) parentIterator.next(); + Grouping grouping = groupingActivity.getCreateGrouping(); + groupingList.add(grouping.getGroupingDTO()); } return groupingList; } public ArrayList populateActivities(LearningDesign design) { - ArrayList activities = new ArrayList(); + ArrayList activities = new ArrayList(); //ArrayList childActivities = null; Iterator parentIterator = design.getParentActivities().iterator(); while(parentIterator.hasNext()){ Activity object = (Activity) parentIterator.next(); - //method commented out below because error occurs when opening a a learning design with a complex activity. Some hibernate casting exception - /* if(object.isComplexActivity()) - { - ComplexActivity complexActivity = (ComplexActivity)object; - Iterator childIterator = complexActivity.getActivities().iterator(); - childActivities = new ArrayList(); - while(childIterator.hasNext()){ - Activity activity =(Activity)childIterator.next(); - childActivities.add(activity.getAuthoringActivityDTO()); - } - activities.add(complexActivity.getAuthoringActivityDTO()); - activities.addAll(childActivities); - }else{ - activities.add(object.getAuthoringActivityDTO()); - } - - - }*/ if (object.isComplexActivity()) { - Set dtoSet = object.getAuthoringActivityDTOSet(); + Set dtoSet = object.getAuthoringActivityDTOSet(); activities.addAll(dtoSet); } else @@ -438,7 +424,7 @@ return activities; } public ArrayList populateTransitions(LearningDesign design){ - ArrayList transitions = new ArrayList(); + ArrayList transitions = new ArrayList(); if(design.getTransitions()!=null){ Iterator iterator = design.getTransitions().iterator(); while(iterator.hasNext()){ Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java (.../ILearningDesignService.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java (.../ILearningDesignService.java) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -24,7 +24,9 @@ package org.lamsfoundation.lams.learningdesign.service; import java.util.Vector; + import org.lamsfoundation.lams.learningdesign.LearningDesign; +import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO; /** * @author Mitchell Seaton @@ -33,6 +35,13 @@ public interface ILearningDesignService{ /** + * Get the learning design DTO, suitable to send to Flash via WDDX + * @param learningDesignId + * @return LearningDesignDTO + */ + public LearningDesignDTO getLearningDesignDTO(Long learningDesignID); + + /** * This method calls other validation methods which apply the validation * rules to determine whether or not the learning design is valid. * Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -24,6 +24,13 @@ package org.lamsfoundation.lams.learningdesign.service; import org.apache.log4j.Logger; +import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO; +import org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO; +import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO; +import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO; +import org.lamsfoundation.lams.learningdesign.dao.hibernate.LicenseDAO; +import org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO; +import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO; import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.GateActivity; @@ -35,6 +42,9 @@ import java.util.Set; import java.util.Vector; +import org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO; +import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO; +import org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO; import org.lamsfoundation.lams.util.MessageService; /** @@ -54,6 +64,9 @@ //protected Logger log = Logger.getLogger(LearningDesignService.class); protected MessageService messageService; + protected LearningDesignDAO learningDesignDAO; + protected ActivityDAO activityDAO; + /* * Default constructor * @@ -82,6 +95,16 @@ /********************************************** * Service Methods * *******************************************/ + + /** + * Get the learning design DTO, suitable to send to Flash via WDDX + * @param learningDesignId + * @return LearningDesignDTO + */ + public LearningDesignDTO getLearningDesignDTO(Long learningDesignID) { + LearningDesign design = learningDesignID!=null ? learningDesignDAO.getLearningDesignById(learningDesignID) : null; + return design != null ? new LearningDesignDTO(design,activityDAO) : null; + } /** * This method calls other validation methods which apply the validation @@ -361,6 +384,14 @@ } } + + public void setActivityDAO(ActivityDAO activityDAO) { + this.activityDAO = activityDAO; + } + + public void setLearningDesignDAO(LearningDesignDAO learningDesignDAO) { + this.learningDesignDAO = learningDesignDAO; + } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java =================================================================== diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java (.../Workspace.java) (revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java (.../Workspace.java) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -44,6 +44,9 @@ private WorkspaceFolder rootFolder; /** persistent field */ + private WorkspaceFolder defaultRunSequencesFolder; + + /** persistent field */ private Set users; /** persistent field */ @@ -101,6 +104,22 @@ /** + * @hibernate.many-to-one + * not-null="true" + * lazy="false" + * @hibernate.column name="def_run_seq_fld_id" + * + */ + public WorkspaceFolder getDefaultRunSequencesFolder() { + return defaultRunSequencesFolder; + } + + public void setDefaultRunSequencesFolder(WorkspaceFolder defaultRunSequencesFolder) { + this.defaultRunSequencesFolder = defaultRunSequencesFolder; + } + + + /** * @hibernate.set * lazy="true" * inverse="true" Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r03392c988a23f5e9129967f8ae692488213632fe --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java (.../TestLearningDesignDAO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java (.../TestLearningDesignDAO.java) (revision 03392c988a23f5e9129967f8ae692488213632fe) @@ -32,8 +32,6 @@ import org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO; import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO; import org.lamsfoundation.lams.test.AbstractCommonTestCase; -import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO; import org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO; import org.lamsfoundation.lams.util.wddx.WDDXProcessor; @@ -46,8 +44,8 @@ private LearningDesignDAO learningDesignDAO; protected TransitionDAO transitionDAO; protected WorkspaceFolderDAO workspaceFolderDAO; - private UserDAO userDAO; - private User user; + //private UserDAO userDAO; + //private User user; private LearningDesign learningDesign; public TestLearningDesignDAO(String name) { @@ -58,7 +56,7 @@ learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO"); transitionDAO =(TransitionDAO) context.getBean("transitionDAO"); activityDAO =(ActivityDAO) context.getBean("activityDAO"); - userDAO = (UserDAO)context.getBean("userDAO"); + //userDAO = (UserDAO)context.getBean("userDAO"); } public void testCalculateFirstActivity(){ learningDesign = learningDesignDAO.getLearningDesignById(new Long(1)); @@ -73,7 +71,7 @@ } public void testGetLearningDesignDTO() throws Exception{ learningDesign = learningDesignDAO.getLearningDesignById(new Long(1)); - LearningDesignDTO learningDesignDTO = learningDesign.getLearningDesignDTO(); + LearningDesignDTO learningDesignDTO = new LearningDesignDTO(learningDesign,activityDAO); String str = WDDXProcessor.serialize(learningDesignDTO); System.out.println(str); }