Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -ra3249210e9a22e8f54ece275f8243a8f3f3e7217 -r3c92e96dc7aea4200c6fd6c6b0b1a9e2ccfb2961 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision a3249210e9a22e8f54ece275f8243a8f3f3e7217) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 3c92e96dc7aea4200c6fd6c6b0b1a9e2ccfb2961) @@ -48,7 +48,7 @@ import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.authoring.IObjectExtractor; import org.lamsfoundation.lams.authoring.ObjectExtractorException; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ActivityEvaluation; import org.lamsfoundation.lams.learningdesign.BranchActivityEntry; @@ -67,16 +67,16 @@ import org.lamsfoundation.lams.learningdesign.SequenceActivity; import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.learningdesign.Transition; +import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; import org.lamsfoundation.lams.learningdesign.dao.IBranchActivityEntryDAO; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceDAO; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceMappingDAO; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO; -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.dao.ICompetenceDAO; +import org.lamsfoundation.lams.learningdesign.dao.ICompetenceMappingDAO; +import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO; +import org.lamsfoundation.lams.learningdesign.dao.IGroupingDAO; +import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO; +import org.lamsfoundation.lams.learningdesign.dao.ILearningLibraryDAO; +import org.lamsfoundation.lams.learningdesign.dao.ILicenseDAO; +import org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO; import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO; import org.lamsfoundation.lams.learningdesign.dto.DesignDetailDTO; import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO; @@ -94,8 +94,8 @@ import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolContentIDGenerator; import org.lamsfoundation.lams.tool.ToolOutputDefinition; -import org.lamsfoundation.lams.tool.dao.hibernate.SystemToolDAO; -import org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO; +import org.lamsfoundation.lams.tool.dao.ISystemToolDAO; +import org.lamsfoundation.lams.tool.dao.IToolDAO; import org.lamsfoundation.lams.tool.dto.ToolOutputDefinitionDTO; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; @@ -131,29 +131,29 @@ protected Logger log = Logger.getLogger(AuthoringService.class); /** Required DAO's */ - protected LearningDesignDAO learningDesignDAO; + protected ILearningDesignDAO learningDesignDAO; - protected LearningLibraryDAO learningLibraryDAO; + protected ILearningLibraryDAO learningLibraryDAO; - protected ActivityDAO activityDAO; + protected IActivityDAO activityDAO; - protected BaseDAO baseDAO; + protected IBaseDAO baseDAO; - protected TransitionDAO transitionDAO; + protected ITransitionDAO transitionDAO; - protected ToolDAO toolDAO; + protected IToolDAO toolDAO; - protected LicenseDAO licenseDAO; + protected ILicenseDAO licenseDAO; - protected GroupingDAO groupingDAO; + protected IGroupingDAO groupingDAO; - protected GroupDAO groupDAO; + protected IGroupDAO groupDAO; - protected CompetenceDAO competenceDAO; + protected ICompetenceDAO competenceDAO; - protected CompetenceMappingDAO competenceMappingDAO; + protected ICompetenceMappingDAO competenceMappingDAO; - protected SystemToolDAO systemToolDAO; + protected ISystemToolDAO systemToolDAO; protected PedagogicalPlannerDAO pedagogicalPlannerDAO; @@ -200,11 +200,11 @@ * @param groupDAO * The groupDAO to set. */ - public void setGroupDAO(GroupDAO groupDAO) { + public void setGroupDAO(IGroupDAO groupDAO) { this.groupDAO = groupDAO; } - public void setGroupingDAO(GroupingDAO groupingDAO) { + public void setGroupingDAO(IGroupingDAO groupingDAO) { this.groupingDAO = groupingDAO; } @@ -216,95 +216,95 @@ * * @return */ - public CompetenceDAO getCompetenceDAO() { + public ICompetenceDAO getCompetenceDAO() { return competenceDAO; } /** * * @param competenceDAO */ - public void setCompetenceDAO(CompetenceDAO competenceDAO) { + public void setCompetenceDAO(ICompetenceDAO competenceDAO) { this.competenceDAO = competenceDAO; } /** * * @return */ - public CompetenceMappingDAO getCompetenceMappingDAO() { + public ICompetenceMappingDAO getCompetenceMappingDAO() { return competenceMappingDAO; } /** * * @param competenceMappingDAO */ - public void setCompetenceMappingDAO(CompetenceMappingDAO competenceMappingDAO) { + public void setCompetenceMappingDAO(ICompetenceMappingDAO competenceMappingDAO) { this.competenceMappingDAO = competenceMappingDAO; } /** * @param transitionDAO * The transitionDAO to set */ - public void setTransitionDAO(TransitionDAO transitionDAO) { + public void setTransitionDAO(ITransitionDAO transitionDAO) { this.transitionDAO = transitionDAO; } /** * @param learningDesignDAO * The learningDesignDAO to set. */ - public void setLearningDesignDAO(LearningDesignDAO learningDesignDAO) { + public void setLearningDesignDAO(ILearningDesignDAO learningDesignDAO) { this.learningDesignDAO = learningDesignDAO; } /** * @param learningLibraryDAO * The learningLibraryDAO to set. */ - public void setLearningLibraryDAO(LearningLibraryDAO learningLibraryDAO) { + public void setLearningLibraryDAO(ILearningLibraryDAO learningLibraryDAO) { this.learningLibraryDAO = learningLibraryDAO; } /** * @param baseDAO * The baseDAO to set. */ - public void setBaseDAO(BaseDAO baseDAO) { + public void setBaseDAO(IBaseDAO baseDAO) { this.baseDAO = baseDAO; } /** * @param activityDAO * The activityDAO to set. */ - public void setActivityDAO(ActivityDAO activityDAO) { + public void setActivityDAO(IActivityDAO activityDAO) { this.activityDAO = activityDAO; } /** * @param toolDAO * The toolDAO to set */ - public void setToolDAO(ToolDAO toolDAO) { + public void setToolDAO(IToolDAO toolDAO) { this.toolDAO = toolDAO; } /** * @param toolDAO * The toolDAO to set */ - public void setSystemToolDAO(SystemToolDAO systemToolDAO) { + public void setSystemToolDAO(ISystemToolDAO systemToolDAO) { this.systemToolDAO = systemToolDAO; } /** * @param licenseDAO * The licenseDAO to set */ - public void setLicenseDAO(LicenseDAO licenseDAO) { + public void setLicenseDAO(ILicenseDAO licenseDAO) { this.licenseDAO = licenseDAO; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java =================================================================== diff -u -r1ab5b0aabad85e5cee0203bd43e0da1c83f69fb9 -r3c92e96dc7aea4200c6fd6c6b0b1a9e2ccfb2961 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 1ab5b0aabad85e5cee0203bd43e0da1c83f69fb9) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 3c92e96dc7aea4200c6fd6c6b0b1a9e2ccfb2961) @@ -37,8 +37,8 @@ import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.LearningDesignAnnotation; import org.lamsfoundation.lams.learningdesign.Transition; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO; -import org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO; +import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; +import org.lamsfoundation.lams.learningdesign.dao.IGroupingDAO; import org.lamsfoundation.lams.util.wddx.WDDXTAGS; /** @@ -89,7 +89,7 @@ public LearningDesignDTO() { } - public LearningDesignDTO(LearningDesign learningDesign, ActivityDAO activityDAO, GroupingDAO groupingDAO, + public LearningDesignDTO(LearningDesign learningDesign, IActivityDAO activityDAO, IGroupingDAO groupingDAO, String languageCode) { this.learningDesignID = learningDesign.getLearningDesignId(); this.learningDesignUIID = learningDesign.getLearningDesignUIID(); @@ -375,7 +375,7 @@ * @param setupUserList * @return ArrayList the array of groupingDTOs */ - public ArrayList populateGroupings(LearningDesign design, GroupingDAO groupingDAO) { + public ArrayList populateGroupings(LearningDesign design, IGroupingDAO groupingDAO) { ArrayList groupingList = new ArrayList(); List dbGroupings = groupingDAO.getGroupingsByLearningDesign(design.getLearningDesignId()); if (dbGroupings != null) { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java =================================================================== diff -u -rff01a6c237cefc4a5186889bf46041152cfc37ae -r3c92e96dc7aea4200c6fd6c6b0b1a9e2ccfb2961 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision ff01a6c237cefc4a5186889bf46041152cfc37ae) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision 3c92e96dc7aea4200c6fd6c6b0b1a9e2ccfb2961) @@ -44,10 +44,10 @@ import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.LearningLibrary; import org.lamsfoundation.lams.learningdesign.LearningLibraryGroup; -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.IActivityDAO; +import org.lamsfoundation.lams.learningdesign.dao.IGroupingDAO; +import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO; +import org.lamsfoundation.lams.learningdesign.dao.ILearningLibraryDAO; import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO; import org.lamsfoundation.lams.learningdesign.dto.LearningLibraryDTO; import org.lamsfoundation.lams.learningdesign.dto.LibraryActivityDTO; @@ -81,11 +81,11 @@ protected Logger log = Logger.getLogger(LearningDesignService.class); protected MessageService messageService; - protected LearningDesignDAO learningDesignDAO; - protected ActivityDAO activityDAO; - protected GroupingDAO groupingDAO; + protected ILearningDesignDAO learningDesignDAO; + protected IActivityDAO activityDAO; + protected IGroupingDAO groupingDAO; - protected LearningLibraryDAO learningLibraryDAO; + protected ILearningLibraryDAO learningLibraryDAO; protected ILoadedMessageSourceService toolActMessageService; /* @@ -124,19 +124,19 @@ this.toolActMessageService = toolActMessageService; } - public void setLearningLibraryDAO(LearningLibraryDAO learningLibraryDAO) { + public void setLearningLibraryDAO(ILearningLibraryDAO learningLibraryDAO) { this.learningLibraryDAO = learningLibraryDAO; } - public void setActivityDAO(ActivityDAO activityDAO) { + public void setActivityDAO(IActivityDAO activityDAO) { this.activityDAO = activityDAO; } - public void setLearningDesignDAO(LearningDesignDAO learningDesignDAO) { + public void setLearningDesignDAO(ILearningDesignDAO learningDesignDAO) { this.learningDesignDAO = learningDesignDAO; } - public void setGroupingDAO(GroupingDAO groupingDAO) { + public void setGroupingDAO(IGroupingDAO groupingDAO) { this.groupingDAO = groupingDAO; }