Index: lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java =================================================================== diff -u -re0b070e11b6c51b15b0f39906c8e3536f8ac09f0 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java (.../ConfigurationDAO.java) (revision e0b070e11b6c51b15b0f39906c8e3536f8ac09f0) +++ lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java (.../ConfigurationDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -30,7 +30,7 @@ import org.lamsfoundation.lams.config.ConfigurationItem; import org.lamsfoundation.lams.config.dao.IConfigurationDAO; import org.lamsfoundation.lams.dao.hibernate.BaseDAO; -import org.springframework.orm.hibernate3.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateCallback; /** * Index: lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java =================================================================== diff -u -r2dd947ef3812e8d41a9e4be552f54e71ecd1558a -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java (.../BaseDAO.java) (revision 2dd947ef3812e8d41a9e4be552f54e71ecd1558a) +++ lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java (.../BaseDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -33,7 +33,7 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.dao.IBaseDAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @version Index: lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java (.../EventDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java (.../EventDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -5,7 +5,7 @@ import org.lamsfoundation.lams.events.Event; import org.lamsfoundation.lams.events.dao.EventDAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; class EventDAOHibernate extends HibernateDaoSupport implements EventDAO { Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java =================================================================== diff -u -r44fece9a7e07417b4d623bf0f93ddb0fe8f724fa -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java (.../GradebookDAO.java) (revision 44fece9a7e07417b4d623bf0f93ddb0fe8f724fa) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java (.../GradebookDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -65,7 +65,7 @@ @SuppressWarnings("unchecked") public GradebookUserActivity getGradebookUserDataForActivity(Long activityID, Integer userID) { - List result = getSession().createQuery(GET_GRADEBOOK_USER_ACTIVITY).setInteger("userID", userID.intValue()) + List result = getSessionFactory().getCurrentSession().createQuery(GET_GRADEBOOK_USER_ACTIVITY).setInteger("userID", userID.intValue()) .setLong("activityID", activityID.longValue()).list(); if (result != null) { @@ -78,7 +78,7 @@ @SuppressWarnings("unchecked") public GradebookUserLesson getGradebookUserDataForLesson(Long lessonID, Integer userID) { - List result = getSession().createQuery(GET_GRADEBOOK_USER_LESSON).setInteger("userID", userID.intValue()) + List result = getSessionFactory().getCurrentSession().createQuery(GET_GRADEBOOK_USER_LESSON).setInteger("userID", userID.intValue()) .setLong("lessonID", lessonID.longValue()).list(); if (result != null) { @@ -92,7 +92,7 @@ @SuppressWarnings("unchecked") public Double getGradebookUserActivityMarkSum(Long lessonID, Integer userID) { - List result = getSession().createQuery(GET_GRADEBOOK_ACTIVITIES_FROM_LESSON_SUM) + List result = getSessionFactory().getCurrentSession().createQuery(GET_GRADEBOOK_ACTIVITIES_FROM_LESSON_SUM) .setInteger("userID", userID.intValue()).setLong("lessonID", lessonID.longValue()).list(); if (result != null) { @@ -106,15 +106,15 @@ @SuppressWarnings("unchecked") public List getAllGradebookUserActivitiesForActivity(Long activityID) { - List result = getSession().createQuery(GET_GRADEBOOK_USER_ACTIVITIES_FOR_ACTIVITY) + List result = getSessionFactory().getCurrentSession().createQuery(GET_GRADEBOOK_USER_ACTIVITIES_FOR_ACTIVITY) .setLong("activityID", activityID.longValue()).list(); return (List) result; } @SuppressWarnings("unchecked") public Double getAverageMarkForLesson(Long lessonID) { - List result = getSession().createQuery(GET_AVERAGE_MARK_FOR_LESSON).setLong("lessonID", lessonID.longValue()) + List result = getSessionFactory().getCurrentSession().createQuery(GET_AVERAGE_MARK_FOR_LESSON).setLong("lessonID", lessonID.longValue()) .list(); if (result != null) { @@ -127,7 +127,7 @@ @SuppressWarnings("unchecked") public long getAverageDurationLesson(Long lessonID) { - List result = (List) getSession().createQuery(GET_AVERAGE_COMPLETION_TIME) + List result = (List) getSessionFactory().getCurrentSession().createQuery(GET_AVERAGE_COMPLETION_TIME) .setLong("lessonID", lessonID.longValue()).list(); if (result != null) { @@ -159,7 +159,7 @@ @SuppressWarnings("unchecked") public long getAverageDurationForActivity(Long activityID) { - List result = (List) getSession().createQuery(GET_AVERAGE_COMPLETION_TIME_ACTIVITY) + List result = (List) getSessionFactory().getCurrentSession().createQuery(GET_AVERAGE_COMPLETION_TIME_ACTIVITY) .setLong("activityID", activityID.longValue()).list(); if (result != null) { @@ -191,7 +191,7 @@ @SuppressWarnings("unchecked") public Double getAverageMarkForActivity(Long activityID) { - List result = getSession().createQuery(GET_AVERAGE_MARK_FOR_ACTIVTY) + List result = getSessionFactory().getCurrentSession().createQuery(GET_AVERAGE_MARK_FOR_ACTIVTY) .setLong("activityID", activityID.longValue()).list(); if (result != null) { @@ -205,7 +205,7 @@ @SuppressWarnings("unchecked") public Double getAverageMarkForGroupedActivity(Long activityID, Long groupID) { - List result = getSession().createQuery(GET_AVERAGE_MARK_FOR_GROUPED_ACTIVTY) + List result = getSessionFactory().getCurrentSession().createQuery(GET_AVERAGE_MARK_FOR_GROUPED_ACTIVTY) .setLong("activityID", activityID.longValue()).setLong("groupID", groupID.longValue()).list(); if (result != null) { @@ -218,7 +218,7 @@ @SuppressWarnings("unchecked") public long getAverageDurationForGroupedActivity(Long activityID, Long groupID) { - List result = (List) getSession().createQuery(GET_AVERAGE_COMPLETION_TIME_GROUPED_ACTIVITY) + List result = (List) getSessionFactory().getCurrentSession().createQuery(GET_AVERAGE_COMPLETION_TIME_GROUPED_ACTIVITY) .setLong("activityID", activityID.longValue()).setLong("groupID", groupID.longValue()).list(); if (result != null) { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java =================================================================== diff -u -rd3b9b5d94b98da06dcce673877406d8e580a114e -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (.../ActivityDAO.java) (revision d3b9b5d94b98da06dcce673877406d8e580a114e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (.../ActivityDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -192,7 +192,7 @@ public Activity getActivityByUIID(Integer id, LearningDesign design) { if (id != null && design != null) { Long designID = design.getLearningDesignId(); - Query query = this.getSession().createQuery(ActivityDAO.FIND_BY_UI_ID); + Query query = this.getSessionFactory().getCurrentSession().createQuery(ActivityDAO.FIND_BY_UI_ID); query.setInteger(0, id.intValue()); query.setLong(1, designID.longValue()); return getNonCGLibActivity((Activity) query.uniqueResult()); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java =================================================================== diff -u -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java (.../CompetenceDAO.java) (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java (.../CompetenceDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -34,7 +34,7 @@ import org.lamsfoundation.lams.learningdesign.CompetenceMapping; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.dao.hibernate.BaseDAO; -import org.springframework.orm.hibernate3.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateCallback; public class CompetenceDAO extends BaseDAO implements ICompetenceDAO { @@ -60,7 +60,7 @@ { if ( design != null && competenceTitle != null ) { Long designID = design.getLearningDesignId(); - Query query = this.getSession().createQuery(LOAD_COMPETENCE_BY_LDID_AND_TITLE); + Query query = getSessionFactory().getCurrentSession().createQuery(LOAD_COMPETENCE_BY_LDID_AND_TITLE); query.setString(0,competenceTitle); query.setLong(1,designID.longValue()); return (Competence) query.uniqueResult(); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java =================================================================== diff -u -rfdbf7a3cfb10831b1ac581efa42807d3207a71ff -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java (.../CompetenceMappingDAO.java) (revision fdbf7a3cfb10831b1ac581efa42807d3207a71ff) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java (.../CompetenceMappingDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -25,7 +25,7 @@ if ( toolActivity != null && competence != null ) { Long activityId = toolActivity.getActivityId(); Long competenceId = competence.getCompetenceId(); - Query query = this.getSession().createQuery(LOAD_COMPETENCE_MAPPING_BY_ACTIVITY_AND_COMPETENCE); + Query query = getSessionFactory().getCurrentSession().createQuery(LOAD_COMPETENCE_MAPPING_BY_ACTIVITY_AND_COMPETENCE); query.setLong(0,competenceId); query.setLong(1,activityId.longValue()); return (CompetenceMapping) query.uniqueResult(); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java =================================================================== diff -u -raca0f0391e13cb11fb37ed0a53d4023663f67111 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java (.../GroupDAO.java) (revision aca0f0391e13cb11fb37ed0a53d4023663f67111) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java (.../GroupDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -35,8 +35,8 @@ import org.lamsfoundation.lams.learningdesign.Grouping; import org.lamsfoundation.lams.learningdesign.GroupingActivity; import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateTemplate; /** * @author Manpreet Minhas Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (.../LearningDesignDAO.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (.../LearningDesignDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -77,7 +77,7 @@ public List getLearningDesignByUserId(Long userID){ if ( userID != null ) { try{ - Query query = this.getSession().createQuery(FIND_BY_USERID); + Query query = getSessionFactory().getCurrentSession().createQuery(FIND_BY_USERID); query.setLong(0,userID.longValue()); return query.list(); }catch(HibernateException he){ Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java (.../LearningLibraryDAO.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningLibraryDAO.java (.../LearningLibraryDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -47,7 +47,7 @@ @Override @SuppressWarnings("unchecked") public List getAllLearningLibraries() { - return getSession().createQuery(LearningLibraryDAO.FIND_VALID_LIB).list(); + return getSessionFactory().getCurrentSession().createQuery(LearningLibraryDAO.FIND_VALID_LIB).list(); } @Override Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java (.../TransitionDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java (.../TransitionDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -60,7 +60,7 @@ */ public Transition getTransitionByToActivityID(Long toActivityID) { if ( toActivityID != null ) { - Query query = this.getSession().createQuery(FIND_BY_TO_ACTIVITY); + Query query = getSessionFactory().getCurrentSession().createQuery(FIND_BY_TO_ACTIVITY); query.setLong(0,toActivityID.longValue()); return (Transition) query.uniqueResult(); } @@ -73,7 +73,7 @@ */ public Transition getTransitionByfromActivityID(Long fromActivityID) { if ( fromActivityID != null ) { - return (Transition) this.getSession().createQuery(FIND_BY_FROM_ACTIVITY) + return (Transition) getSessionFactory().getCurrentSession().createQuery(FIND_BY_FROM_ACTIVITY) .setLong(0,fromActivityID.longValue()) .uniqueResult(); } @@ -82,7 +82,7 @@ public List getTransitionsByLearningDesignID(Long learningDesignID){ if ( learningDesignID != null ) { - return this.getSession().createQuery(FIND_BY_LEARNING_DESIGN_ID) + return getSessionFactory().getCurrentSession().createQuery(FIND_BY_LEARNING_DESIGN_ID) .setLong(0, learningDesignID.longValue()) .list(); } @@ -100,7 +100,7 @@ { if ( transitionUUID != null && learningDesign != null ) { Long designID = learningDesign.getLearningDesignId(); - Query query = this.getSession().createQuery(FIND_BY_UI_ID); + Query query = getSessionFactory().getCurrentSession().createQuery(FIND_BY_UI_ID); query.setInteger(0,transitionUUID.intValue()); query.setLong(1,designID.longValue()); return (Transition) query.uniqueResult(); Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java =================================================================== diff -u -r7d898ea4d62e737512701712ddf4c5e1e0ac3021 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java (.../ILearnerProgressDAO.java) (revision 7d898ea4d62e737512701712ddf4c5e1e0ac3021) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java (.../ILearnerProgressDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -30,8 +30,8 @@ import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.usermanagement.User; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateTemplate; /** * Inteface defines Lesson DAO Methods Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java =================================================================== diff -u -r7d898ea4d62e737512701712ddf4c5e1e0ac3021 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java (.../LearnerProgressDAO.java) (revision 7d898ea4d62e737512701712ddf4c5e1e0ac3021) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java (.../LearnerProgressDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -32,9 +32,9 @@ import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO; import org.lamsfoundation.lams.usermanagement.User; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * Hibernate implementation of ILearnerProgressDAO Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java (.../LessonDAO.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java (.../LessonDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -39,8 +39,8 @@ import org.lamsfoundation.lams.lesson.dao.ILessonDAO; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateTemplate; /** * Hibernate implementation of ILessonDAO Index: lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java (.../PedagogicalPlannerDAOHibernate.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_common/src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java (.../PedagogicalPlannerDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -34,7 +34,7 @@ import org.lamsfoundation.lams.planner.dao.PedagogicalPlannerDAO; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * Index: lams_common/src/java/org/lamsfoundation/lams/themes/dao/hibernate/CSSThemeDAO.java =================================================================== diff -u -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/themes/dao/hibernate/CSSThemeDAO.java (.../CSSThemeDAO.java) (revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a) +++ lams_common/src/java/org/lamsfoundation/lams/themes/dao/hibernate/CSSThemeDAO.java (.../CSSThemeDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -27,7 +27,7 @@ import org.lamsfoundation.lams.themes.Theme; import org.lamsfoundation.lams.themes.dao.ICSSThemeDAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * This class interacts with Spring's HibernateTemplate to save/delete and Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/SystemToolDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/SystemToolDAO.java (.../SystemToolDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/SystemToolDAO.java (.../SystemToolDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.SystemTool; import org.lamsfoundation.lams.tool.dao.ISystemToolDAO; -import org.springframework.orm.hibernate3.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateCallback; public class SystemToolDAO extends BaseDAO implements ISystemToolDAO { Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java =================================================================== diff -u -r9c4151d572fc555fd5980e3d88580ab1ba9a94bf -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java (.../ToolDAO.java) (revision 9c4151d572fc555fd5980e3d88580ab1ba9a94bf) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java (.../ToolDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,8 +29,8 @@ import org.hibernate.Session; import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.dao.IToolDAO; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolImportSupportDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolImportSupportDAO.java (.../ToolImportSupportDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolImportSupportDAO.java (.../ToolImportSupportDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,8 +29,8 @@ import org.hibernate.Session; import org.lamsfoundation.lams.tool.ToolImportSupport; import org.lamsfoundation.lams.tool.dao.IToolImportSupportDAO; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; public class ToolImportSupportDAO extends HibernateDaoSupport implements IToolImportSupportDAO { Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java (.../ToolSessionDAO.java) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java (.../ToolSessionDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -33,7 +33,7 @@ import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.dao.IToolSessionDAO; import org.lamsfoundation.lams.usermanagement.User; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * Hibernate implementation of ILessonDAO @@ -75,14 +75,14 @@ */ public ToolSession getToolSessionByLearner(final User learner,final Activity activity) { - Query query = this.getSession().createQuery(LOAD_GROUPED_TOOL_SESSION_BY_GROUP2); + Query query = getSessionFactory().getCurrentSession().createQuery(LOAD_GROUPED_TOOL_SESSION_BY_GROUP2); query.setParameter("learner",learner); query.setParameter("activity",activity); GroupedToolSession groupedToolSession = (GroupedToolSession) query.uniqueResult(); if ( groupedToolSession != null ) return groupedToolSession; - query = this.getSession().createQuery(LOAD_NONGROUPED_TOOL_SESSION_BY_LEARNER); + query = getSessionFactory().getCurrentSession().createQuery(LOAD_NONGROUPED_TOOL_SESSION_BY_LEARNER); query.setParameter("learner",learner); query.setParameter("activity",activity); NonGroupedToolSession nonGroupedSession = (NonGroupedToolSession) query.uniqueResult(); @@ -99,7 +99,7 @@ */ public List getToolSessionByActivity(final Activity activity) { - Query query = this.getSession().createQuery(LOAD_TOOL_SESSION_BY_ACTIVITY); + Query query = getSessionFactory().getCurrentSession().createQuery(LOAD_TOOL_SESSION_BY_ACTIVITY); query.setParameter("activity",activity); return (List) query.list(); } @@ -122,7 +122,7 @@ */ public List getToolSessionsByLesson(final Lesson lesson) { - Query query = this.getSession().createQuery(LOAD_TOOL_SESSION_BY_LESSON); + Query query = getSessionFactory().getCurrentSession().createQuery(LOAD_TOOL_SESSION_BY_LESSON); query.setParameter("lesson",lesson); return query.list(); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java =================================================================== diff -u -r07578aaa7f526c0c1b537c127cf5f88e0410d472 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision 07578aaa7f526c0c1b537c127cf5f88e0410d472) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -31,8 +31,8 @@ import org.lamsfoundation.lams.usermanagement.OrganisationState; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateTemplate; /** * @author jliew Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java =================================================================== diff -u -r7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java (.../RoleDAO.java) (revision 7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java (.../RoleDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -31,8 +31,8 @@ import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; import org.lamsfoundation.lams.usermanagement.dao.IRoleDAO; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateTemplate; /** * Hibernate implementation of IRoleDAO * @author chris Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java =================================================================== diff -u -r48eb3881563dc0f2576c2df926f47a75424e1e84 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java (.../UserOrganisationDAO.java) (revision 48eb3881563dc0f2576c2df926f47a75424e1e84) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java (.../UserOrganisationDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -30,8 +30,8 @@ import org.hibernate.Session; import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationDAO; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateTemplate; /** * @author jliew Index: lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java (.../WorkspaceFolderContentDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java (.../WorkspaceFolderContentDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -60,7 +60,7 @@ public int deleteContentWithVersion(Long uuid, Long versionID, Long folderContentID){ int numDeleted = 0; if ( uuid != null && versionID != null && folderContentID != null ) { - List list = this.getSession().createQuery(DELETE_BY_VERSION) + List list = getSessionFactory().getCurrentSession().createQuery(DELETE_BY_VERSION) .setLong(0, folderContentID.longValue()) .setLong(1, uuid.longValue()) .setLong(2,versionID.longValue()) @@ -69,7 +69,7 @@ Iterator iter = list.iterator(); while (iter.hasNext()) { Object element = (Object) iter.next(); - this.getSession().delete(element); + getSessionFactory().getCurrentSession().delete(element); numDeleted++; } } Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java =================================================================== diff -u -r5b4307e77743c078a26bb2b953b6f5245b697e26 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java (.../CredentialDAO.java) (revision 5b4307e77743c078a26bb2b953b6f5245b697e26) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java (.../CredentialDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -113,7 +113,7 @@ } boolean credentialMatched = false; - Session hibernateSession = getSession(); + Session hibernateSession = getSessionFactory().getCurrentSession(); ScrollableResults result = hibernateSession.createSQLQuery(buf.toString()).scroll(); if (result.next()) { long val = result.getLong(0); Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java (.../WorkspaceDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java (.../WorkspaceDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -34,7 +34,7 @@ import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.dao.IWorkspaceDAO; import org.lamsfoundation.lams.dao.hibernate.BaseDAO; -import org.springframework.orm.hibernate3.HibernateObjectRetrievalFailureException; +import org.springframework.orm.hibernate4.HibernateObjectRetrievalFailureException; @@ -99,7 +99,7 @@ public void flushSession() throws RepositoryCheckedException { try { - getSession().flush(); + getSessionFactory().getCurrentSession().flush(); } catch (Exception e) { log.error("Exception occured during flush. ",e); throw new RepositoryCheckedException("Unable to write changes to db successfully (flush).", e); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/BaseDAOHibernate.java =================================================================== diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision c56857991e269aa7f5bd250a05b52c767a9957ad) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.lamsfoundation.lams.tool.assessment.dao.DAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * This class serves as the Base class for all other DAOs - namely to hold common methods that they might all use. Can Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatDAO.java =================================================================== diff -u -ref851974c4dc3f5468b188fab9997a37b73c0e50 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatDAO.java (.../ChatDAO.java) (revision ef851974c4dc3f5468b188fab9997a37b73c0e50) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatDAO.java (.../ChatDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -52,7 +52,6 @@ } public void releaseFromCache(Object o) { - getSession().evict(o); - + getSessionFactory().getCurrentSession().evict(o); } } Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatMessageDAO.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatMessageDAO.java (.../ChatMessageDAO.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatMessageDAO.java (.../ChatMessageDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -89,7 +89,7 @@ public List getLatest(ChatSession chatSession, int max) { try { - Query query = this.getSession().createQuery( + Query query = getSessionFactory().getCurrentSession().createQuery( ChatMessageDAO.SQL_QUERY_FIND_MESSAGE_BY_SESSION_ORDER_BY_DATE_ASC); query.setLong(0, chatSession.getUid()); query.setMaxResults(max); Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/BaseDAOHibernate.java =================================================================== diff -u -r9aa7e24878b41bd6baffa35e83ef392e670811c3 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision 9aa7e24878b41bd6baffa35e83ef392e670811c3) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.lamsfoundation.lams.tool.daco.dao.DAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * This class serves as the Base class for all other DAOs - namely to hold @@ -68,11 +68,11 @@ */ public void removeObject(Class clazz, Serializable id) { getHibernateTemplate().delete(getObject(clazz, id)); - } + } + + public void releaseFromCache(Object o) { + getSessionFactory().getCurrentSession().evict(o); + + } - public void releaseFromCache(Object o) { - getSession().evict(o); - - } - } Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/BaseDAOHibernate.java =================================================================== diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision 7322054ababd8f5387c3424cdd38d99c3ab49e02) +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eucm.lams.tool.eadventure.dao.DAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * This class serves as the Base class for all other DAOs - namely to hold Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/AttachmentDao.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/AttachmentDao.java (.../AttachmentDao.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/AttachmentDao.java (.../AttachmentDao.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -26,8 +26,8 @@ import org.hibernate.HibernateException; import org.hibernate.Session; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * User: conradb Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/BaseDAOHibernate.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * This class serves as the Base class for all other DAOs - namely to hold Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumDao.java =================================================================== diff -u -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumDao.java (.../ForumDao.java) (revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumDao.java (.../ForumDao.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -26,7 +26,7 @@ import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * ForumDao Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java =================================================================== diff -u -r4526bc668178760326017e561b75a0358e10b4fb -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java (.../ForumToolSessionDao.java) (revision 4526bc668178760326017e561b75a0358e10b4fb) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java (.../ForumToolSessionDao.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -27,7 +27,7 @@ import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; public class ForumToolSessionDao extends HibernateDaoSupport { Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java =================================================================== diff -u -r4526bc668178760326017e561b75a0358e10b4fb -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java (.../ForumUserDao.java) (revision 4526bc668178760326017e561b75a0358e10b4fb) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java (.../ForumUserDao.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -27,7 +27,7 @@ import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; public class ForumUserDao extends HibernateDaoSupport{ Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java =================================================================== diff -u -r74865706e83891b502e67d75cad229ca6d6ddcd9 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java (.../MessageDao.java) (revision 74865706e83891b502e67d75cad229ca6d6ddcd9) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java (.../MessageDao.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -28,7 +28,7 @@ import java.util.Date; import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author conradb Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageRatingDAO.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageRatingDAO.java (.../MessageRatingDAO.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageRatingDAO.java (.../MessageRatingDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -28,7 +28,7 @@ import java.util.Locale; import org.lamsfoundation.lams.tool.forum.dto.AverageRatingDTO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * DAO interface for MessageRating.. Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeqDao.java =================================================================== diff -u -r901372af1b71238311d32a55f25ec8ba637bf5ca -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeqDao.java (.../MessageSeqDao.java) (revision 901372af1b71238311d32a55f25ec8ba637bf5ca) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeqDao.java (.../MessageSeqDao.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -28,7 +28,7 @@ import java.util.Date; import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; public class MessageSeqDao extends HibernateDaoSupport { private static final String SQL_QUERY_FIND_TOPIC_THREAD = "from " + MessageSeq.class.getName() Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/TimestampDao.java =================================================================== diff -u -r901372af1b71238311d32a55f25ec8ba637bf5ca -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/TimestampDao.java (.../TimestampDao.java) (revision 901372af1b71238311d32a55f25ec8ba637bf5ca) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/TimestampDao.java (.../TimestampDao.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -27,7 +27,7 @@ import java.util.Date; import java.util.List; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * TimestampDao Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapConfigItemDAO.java =================================================================== diff -u -ra8324ce68a8de301097e84ef4919751ecd0b8fe8 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapConfigItemDAO.java (.../GmapConfigItemDAO.java) (revision a8324ce68a8de301097e84ef4919751ecd0b8fe8) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapConfigItemDAO.java (.../GmapConfigItemDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -5,7 +5,7 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.gmap.dao.IGmapConfigItemDAO; import org.lamsfoundation.lams.tool.gmap.model.GmapConfigItem; -import org.springframework.orm.hibernate3.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateCallback; public class GmapConfigItemDAO extends BaseDAO implements IGmapConfigItemDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = "from GmapConfigItem configuration" Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java =================================================================== diff -u -r6d674e346dea6ce7a824366c8a7c315660677744 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java (.../GmapDAO.java) (revision 6d674e346dea6ce7a824366c8a7c315660677744) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java (.../GmapDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -30,7 +30,7 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.gmap.dao.IGmapDAO; import org.lamsfoundation.lams.tool.gmap.model.Gmap; -import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate4.HibernateTemplate; /** * DAO for accessing the Gmap objects - Hibernate specific code. Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/BaseDAOHibernate.java =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.lamsfoundation.lams.tool.imageGallery.dao.DAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * This class serves as the Base class for all other DAOs - namely to hold Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java =================================================================== diff -u -r915129e3bb3a93900f4098aee480629c55d752e9 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java (.../ImageGalleryConfigItemDAOHibernate.java) (revision 915129e3bb3a93900f4098aee480629c55d752e9) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java (.../ImageGalleryConfigItemDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -28,7 +28,7 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryConfigItemDAO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryConfigItem; -import org.springframework.orm.hibernate3.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateCallback; public class ImageGalleryConfigItemDAOHibernate extends BaseDAO implements ImageGalleryConfigItemDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = "from ImageGalleryConfigItem configuration" Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/BaseDAOHibernate.java =================================================================== diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.lamsfoundation.lams.tool.commonCartridge.dao.DAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * This class serves as the Base class for all other DAOs - namely to hold Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java =================================================================== diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java (.../CommonCartridgeConfigItemDAOHibernate.java) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java (.../CommonCartridgeConfigItemDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -28,7 +28,7 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeConfigItemDAO; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeConfigItem; -import org.springframework.orm.hibernate3.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateCallback; public class CommonCartridgeConfigItemDAOHibernate extends BaseDAO implements CommonCartridgeConfigItemDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = "from CommonCartridgeConfigItem configuration" Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaDAO.java =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaDAO.java (.../KalturaDAO.java) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaDAO.java (.../KalturaDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -52,7 +52,7 @@ } public void releaseFromCache(Object o) { - getSession().evict(o); + getSessionFactory().getCurrentSession().evict(o); } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java =================================================================== diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java (.../McContentDAO.java) (revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java (.../McContentDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -30,9 +30,9 @@ import org.lamsfoundation.lams.tool.mc.dao.IMcContentDAO; import org.lamsfoundation.lams.tool.mc.pojos.McContent; import org.lamsfoundation.lams.tool.mc.pojos.McSession; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author Ozgur Demirtas @@ -52,7 +52,7 @@ String query = "from McContent as mc where mc.mcContentId = ?"; HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(FIND_MC_CONTENT).setLong(0, mcContentId.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(FIND_MC_CONTENT).setLong(0, mcContentId.longValue()).list(); if (list != null && list.size() > 0) { McContent mc = (McContent) list.get(0); @@ -62,28 +62,28 @@ } public void saveMcContent(McContent mcContent) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().saveOrUpdate(mcContent); } public void updateMcContent(McContent mcContent) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().update(mcContent); } public void saveOrUpdateMc(McContent mc) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().saveOrUpdate(mc); } public void removeMcById(Long mcContentId) { HibernateTemplate templ = this.getHibernateTemplate(); if (mcContentId != null) { - List list = getSession().createQuery(FIND_MC_CONTENT).setLong(0, mcContentId.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(FIND_MC_CONTENT).setLong(0, mcContentId.longValue()).list(); if (list != null && list.size() > 0) { McContent mc = (McContent) list.get(0); - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); templ.delete(mc); templ.flush(); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java =================================================================== diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java (.../McOptionsContentDAO.java) (revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java (.../McOptionsContentDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -31,8 +31,8 @@ import org.lamsfoundation.lams.tool.mc.McOptionDTO; import org.lamsfoundation.lams.tool.mc.dao.IMcOptionsContentDAO; import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * Hibernate implementation for database access to McOptionsContent for the mc tool. @@ -51,7 +51,7 @@ public List findMcOptionsContentByQueId(Long questionUid) { if (questionUid != null) { - List list = getSession().createQuery(FIND_OPTIONS_BY_QUESTION_UID) + List list = getSessionFactory().getCurrentSession().createQuery(FIND_OPTIONS_BY_QUESTION_UID) .setLong("mcQueContentUid", questionUid.longValue()).list(); return list; } @@ -62,7 +62,7 @@ List optionDtos = new LinkedList(); if (questionUid != null) { - List options = getSession().createQuery(FIND_OPTIONS_BY_QUESTION_UID) + List options = getSessionFactory().getCurrentSession().createQuery(FIND_OPTIONS_BY_QUESTION_UID) .setLong("mcQueContentUid", questionUid.longValue()).list(); if (options != null && options.size() > 0) { @@ -80,7 +80,7 @@ List listOptionCorrect = new LinkedList(); if (questionUid != null) { - List options = getSession().createQuery(FIND_OPTIONS_BY_QUESTION_UID) + List options = getSessionFactory().getCurrentSession().createQuery(FIND_OPTIONS_BY_QUESTION_UID) .setLong("mcQueContentUid", questionUid.longValue()).list(); if (options != null && options.size() > 0) { @@ -93,7 +93,7 @@ } public McOptsContent getOptionContentByOptionText(final String option, final Long questionUid) { - List list = getSession().createQuery(FIND_OPTIONS_BY_OPTION_TEXT).setString("option", option) + List list = getSessionFactory().getCurrentSession().createQuery(FIND_OPTIONS_BY_OPTION_TEXT).setString("option", option) .setLong("mcQueContentUid", questionUid.longValue()).list(); if (list != null && list.size() > 0) { @@ -117,7 +117,7 @@ } public void removeMcOptionsContent(McOptsContent mcOptsContent) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(mcOptsContent); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java =================================================================== diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java (.../McQueContentDAO.java) (revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java (.../McQueContentDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -28,8 +28,8 @@ import org.hibernate.FlushMode; import org.lamsfoundation.lams.tool.mc.dao.IMcQueContentDAO; import org.lamsfoundation.lams.tool.mc.pojos.McQueContent; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * Hibernate implementation for database access to McQueContent for the mc tool. @@ -56,7 +56,7 @@ public McQueContent findMcQuestionContentByUid(Long uid) { HibernateTemplate templ = this.getHibernateTemplate(); if (uid != null) { - List list = getSession().createQuery(FIND_QUESTION_CONTENT_BY_UID).setLong("uid", uid.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(FIND_QUESTION_CONTENT_BY_UID).setLong("uid", uid.longValue()).list(); if (list != null && list.size() > 0) { McQueContent mcq = (McQueContent) list.get(0); @@ -74,7 +74,7 @@ @Override public List getQuestionsByContentUid(final long contentUid) { HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID).setLong("mcContentId", contentUid) + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID).setLong("mcContentId", contentUid) .list(); return list; @@ -83,7 +83,7 @@ @Override public List refreshQuestionContent(final Long mcContentId) { HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(REFRESH_QUESTION_CONTENT).setLong("mcContentId", mcContentId.longValue()) + List list = getSessionFactory().getCurrentSession().createQuery(REFRESH_QUESTION_CONTENT).setLong("mcContentId", mcContentId.longValue()) .list(); return list; @@ -92,7 +92,7 @@ @Override public McQueContent getQuestionContentByQuestionText(final String question, final Long mcContentUid) { HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT).setString("question", question) + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT).setString("question", question) .setLong("mcContentUid", mcContentUid.longValue()).list(); if (list != null && list.size() > 0) { @@ -105,7 +105,7 @@ @Override public McQueContent getQuestionContentByDisplayOrder(final Long displayOrder, final Long mcContentUid) { HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER) + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER) .setLong("displayOrder", displayOrder.longValue()).setLong("mcContentUid", mcContentUid.longValue()) .list(); @@ -119,14 +119,14 @@ @Override public void removeQuestionContentByMcUid(final Long mcContentUid) { HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID) + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID) .setLong("mcContentId", mcContentUid.longValue()).list(); if (list != null && list.size() > 0) { Iterator listIterator = list.iterator(); while (listIterator.hasNext()) { McQueContent mcQueContent = (McQueContent) listIterator.next(); - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); templ.delete(mcQueContent); templ.flush(); } @@ -136,14 +136,14 @@ @Override public void resetAllQuestions(final Long mcContentUid) { HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID) + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID) .setLong("mcContentId", mcContentUid.longValue()).list(); if (list != null && list.size() > 0) { Iterator listIterator = list.iterator(); while (listIterator.hasNext()) { McQueContent mcQueContent = (McQueContent) listIterator.next(); - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); templ.update(mcQueContent); } } @@ -152,7 +152,7 @@ @Override public List getNextAvailableDisplayOrder(final long mcContentId) { HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(GET_NEXT_AVAILABLE_DISPLAY_ORDER).setLong("mcContentId", mcContentId) + List list = getSessionFactory().getCurrentSession().createQuery(GET_NEXT_AVAILABLE_DISPLAY_ORDER).setLong("mcContentId", mcContentId) .list(); return list; @@ -171,20 +171,20 @@ @Override public void removeMcQueContentByUID(Long uid) { McQueContent mcq = (McQueContent) getHibernateTemplate().get(McQueContent.class, uid); - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(mcq); } @Override public void updateMcQueContent(McQueContent mcQueContent) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().saveOrUpdate(mcQueContent); } @Override public List getAllQuestionEntriesSorted(final long mcContentId) { HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER) + List list = getSessionFactory().getCurrentSession().createQuery(SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER) .setLong("mcContentId", mcContentId).list(); return list; @@ -193,7 +193,7 @@ @Override public void removeMcQueContent(McQueContent mcQueContent) { if ((mcQueContent != null) && (mcQueContent.getUid() != null)) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(mcQueContent); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java =================================================================== diff -u -rc369c0326857e08851d03a29d39d4337091f5253 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java (.../McSessionDAO.java) (revision c369c0326857e08851d03a29d39d4337091f5253) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java (.../McSessionDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,8 +29,8 @@ import org.hibernate.Session; import org.lamsfoundation.lams.tool.mc.dao.IMcSessionDAO; import org.lamsfoundation.lams.tool.mc.pojos.McSession; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author ozgurd @@ -52,7 +52,7 @@ public McSession getMcSessionById(Long mcSessionId) { - List list = getSession().createQuery(LOAD_MCSESSION_BY_MCSESSIONID).setLong(0, mcSessionId.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_MCSESSION_BY_MCSESSIONID).setLong(0, mcSessionId.longValue()).list(); if (list != null && list.size() > 0) { McSession mcs = (McSession) list.get(0); @@ -66,12 +66,12 @@ } public void updateMcSession(McSession mcSession) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().update(mcSession); } public void removeMcSession(McSession mcSession) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(mcSession); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java =================================================================== diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -27,7 +27,7 @@ import org.hibernate.FlushMode; import org.lamsfoundation.lams.tool.mc.dao.IMcUserDAO; import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author Ozgur Demirtas @@ -48,7 +48,7 @@ public McQueUsr getMcUserBySession(final Long queUsrId, final Long mcSessionUid) { - List list = getSession().createQuery(GET_USER_BY_USER_ID_SESSION).setLong("queUsrId", queUsrId.longValue()) + List list = getSessionFactory().getCurrentSession().createQuery(GET_USER_BY_USER_ID_SESSION).setLong("queUsrId", queUsrId.longValue()) .setLong("mcSessionUid", mcSessionUid.longValue()).list(); if (list != null && list.size() > 0) { @@ -67,13 +67,13 @@ } public void removeMcUser(McQueUsr mcUser) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(mcUser); } /** Get the max, min and average mark (in that order) for a session */ public Integer[] getMarkStatisticsForSession(Long sessionUid) { - Object[] stats = (Object[]) getSession().createQuery(CALC_MARK_STATS_FOR_SESSION) + Object[] stats = (Object[]) getSessionFactory().getCurrentSession().createQuery(CALC_MARK_STATS_FOR_SESSION) .setLong("mcSessionUid", sessionUid.longValue()).uniqueResult(); if (stats != null) { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java =================================================================== diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -27,7 +27,7 @@ import org.hibernate.FlushMode; import org.lamsfoundation.lams.tool.mc.dao.IMcUsrAttemptDAO; import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author Ozgur Demirtas @@ -71,13 +71,13 @@ @Override public List getFinalizedUserAttempts(final Long userUid) { - return (List) getSession().createQuery(LOAD_ALL_QUESTION_ATTEMPTS) + return (List) getSessionFactory().getCurrentSession().createQuery(LOAD_ALL_QUESTION_ATTEMPTS) .setLong("queUsrUid", userUid.longValue()).list(); } @Override public int getUserTotalMark(final Long userUid) { - List list = getSession().createQuery(FIND_USER_TOTAL_MARK).setLong("userUid", userUid.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(FIND_USER_TOTAL_MARK).setLong("userUid", userUid.longValue()).list(); if (list == null || list.size() == 0) { return 0; @@ -88,7 +88,7 @@ @SuppressWarnings("unchecked") public McUsrAttempt getUserAttemptByQuestion(final Long queUsrUid, final Long mcQueContentId) { - List userAttemptList = (List) getSession() + List userAttemptList = (List) getSessionFactory().getCurrentSession() .createQuery(LOAD_PARTICULAR_QUESTION_ATTEMPT).setLong("queUsrUid", queUsrUid.longValue()) .setLong("mcQueContentId", mcQueContentId.longValue()).list(); if (userAttemptList.size() > 1) { @@ -101,15 +101,15 @@ @Override public void updateMcUsrAttempt(McUsrAttempt mcUsrAttempt) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().update(mcUsrAttempt); } @Override public void removeAllUserAttempts(Long queUserUid) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); - List userAttempts = (List) getSession().createQuery(LOAD_ALL_QUESTION_ATTEMPTS) + List userAttempts = (List) getSessionFactory().getCurrentSession().createQuery(LOAD_ALL_QUESTION_ATTEMPTS) .setLong("queUsrUid", queUserUid.longValue()).list(); for (McUsrAttempt userAttempt : userAttempts) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaConfigItemDAO.java =================================================================== diff -u -r91f0740e75daa643981b757e49d1ed2ed7f0a528 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaConfigItemDAO.java (.../QaConfigItemDAO.java) (revision 91f0740e75daa643981b757e49d1ed2ed7f0a528) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaConfigItemDAO.java (.../QaConfigItemDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -28,7 +28,7 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.qa.QaConfigItem; import org.lamsfoundation.lams.tool.qa.dao.IQaConfigItemDAO; -import org.springframework.orm.hibernate3.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateCallback; public class QaConfigItemDAO extends BaseDAO implements IQaConfigItemDAO { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java =================================================================== diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java (.../QaContentDAO.java) (revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java (.../QaContentDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -31,8 +31,8 @@ import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.dao.IQaContentDAO; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author Ozgur Demirtas @@ -44,7 +44,7 @@ public QaContent getQaByContentId(long qaId) { String query = "from QaContent as qa where qa.qaContentId = ?"; HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(query).setLong(0, qaId).list(); + List list = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, qaId).list(); if (list != null && list.size() > 0) { QaContent qa = (QaContent) list.get(0); @@ -54,27 +54,27 @@ } public void updateQa(QaContent qa) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().update(qa); } public void saveQa(QaContent qa) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().save(qa); } public void saveOrUpdateQa(QaContent qa) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().saveOrUpdate(qa); } public void createQa(QaContent qa) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().save(qa); } public void UpdateQa(QaContent qa) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().update(qa); } @@ -85,19 +85,19 @@ public void removeQa(Long qaContentId) { if (qaContentId != null) { String query = "from qa in class org.lamsfoundation.lams.tool.qa.QaContent" + " where qa.qaContentId = ?"; - Object obj = getSession().createQuery(query).setLong(0, qaContentId.longValue()).uniqueResult(); - this.getSession().setFlushMode(FlushMode.AUTO); + Object obj = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, qaContentId.longValue()).uniqueResult(); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); getHibernateTemplate().delete(obj); } } public void deleteQa(QaContent qaContent) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(qaContent); } public void removeQaById(Long qaId) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); removeQa(qaId); } @@ -107,7 +107,7 @@ public void deleteCondition(QaCondition condition) { if (condition != null && condition.getConditionId() != null) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(condition); } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java =================================================================== diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java (.../QaQueUsrDAO.java) (revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java (.../QaQueUsrDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -32,8 +32,8 @@ import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.dao.IQaQueUsrDAO; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author Ozgur Demirtas @@ -55,7 +55,7 @@ String strGetUser = "from qaQueUsr in class QaQueUsr where qaQueUsr.queUsrId=:queUsrId and qaQueUsr.qaSession.qaSessionId=:qaSessionId"; HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(strGetUser).setLong("queUsrId", queUsrId.longValue()).setLong( + List list = getSessionFactory().getCurrentSession().createQuery(strGetUser).setLong("queUsrId", queUsrId.longValue()).setLong( "qaSessionId", qaSessionId.longValue()).list(); if (list != null && list.size() > 0) { @@ -67,31 +67,31 @@ public List getUserBySessionOnly(final QaSession qaSession) { HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(LOAD_USER_FOR_SESSION).setLong("qaSessionId", + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_USER_FOR_SESSION).setLong("qaSessionId", qaSession.getQaSessionId().longValue()).list(); return list; } public void createUsr(QaQueUsr usr) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().save(usr); } public void updateUsr(QaQueUsr usr) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().update(usr); } public void deleteQaQueUsr(QaQueUsr qaQueUsr) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(qaQueUsr); } public int getTotalNumberOfUsers(QaContent qa) { int returnInt = 0; if (qa != null && qa.getUid() != null) { - List result = getSession().createQuery(GET_USER_COUNT_FOR_CONTENT).setLong("uid", qa.getUid()).list(); + List result = getSessionFactory().getCurrentSession().createQuery(GET_USER_COUNT_FOR_CONTENT).setLong("uid", qa.getUid()).list(); Long resultLong = (result.get(0) != null) ? (Long) result.get(0) : new Long(0); returnInt = resultLong.intValue(); } else { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java =================================================================== diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java (.../QaQuestionDAO.java) (revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java (.../QaQuestionDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.hibernate.FlushMode; import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.dao.IQaQuestionDAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author Ozgur Demirtas @@ -42,7 +42,7 @@ private static final String SORT_QUESTION_BY_DISPLAY_ORDER = "from qaQuestion in class QaQueContent where qaQuestion.qaContent.uid=:uid order by qaQuestion.displayOrder"; public QaQueContent getQuestionByDisplayOrder(Long displayOrder, Long contentUid) { - List list = getSession().createQuery(QaQuestionDAO.LOAD_QUESTION_BY_DISPLAY_ORDER).setLong( + List list = getSessionFactory().getCurrentSession().createQuery(QaQuestionDAO.LOAD_QUESTION_BY_DISPLAY_ORDER).setLong( "displayOrder", displayOrder.longValue()).setLong("uid", contentUid.longValue()).list(); if (list != null && list.size() > 0) { @@ -53,7 +53,7 @@ } public QaQueContent getQuestionByUid(Long questionUid) { - List list = getSession().createQuery(QaQuestionDAO.LOAD_QUESTION_BY_QUESTION_UID).setLong( + List list = getSessionFactory().getCurrentSession().createQuery(QaQuestionDAO.LOAD_QUESTION_BY_QUESTION_UID).setLong( "uid", questionUid.longValue()).list(); if (list != null && list.size() > 0) { @@ -64,38 +64,38 @@ } public List getAllQuestionEntriesSorted(final long contentUid) { - List list = getSession().createQuery(QaQuestionDAO.SORT_QUESTION_BY_DISPLAY_ORDER).setLong( + List list = getSessionFactory().getCurrentSession().createQuery(QaQuestionDAO.SORT_QUESTION_BY_DISPLAY_ORDER).setLong( "uid", contentUid).list(); return list; } public List getAllQuestionEntries(final long contentUid) { - List list = getSession().createQuery(QaQuestionDAO.LOAD_QUESTION_BY_CONTENT_UID).setLong( + List list = getSessionFactory().getCurrentSession().createQuery(QaQuestionDAO.LOAD_QUESTION_BY_CONTENT_UID).setLong( "uid", contentUid).list(); return list; } public void createQueContent(QaQueContent queContent) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().save(queContent); } public void saveOrUpdateQaQueContent(QaQueContent qaQuestion) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().saveOrUpdate(qaQuestion); } public void removeQueContent(long qaQueContentId) { QaQueContent qaQuestion = (QaQueContent) this.getHibernateTemplate().load(QaQueContent.class, new Long(qaQueContentId)); - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(qaQuestion); } public void removeQaQueContent(QaQueContent qaQuestion) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(qaQuestion); } } \ No newline at end of file Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java =================================================================== diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java (.../QaSessionDAO.java) (revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java (.../QaSessionDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.dao.IQaSessionDAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author Ozgur Demirtas @@ -40,7 +40,7 @@ private static final String GET_SESSION_IDS_FROM_CONTENT = "select qas.qaSessionId from QaSession qas where qas.qaContent=:qaContent order by qas.session_name asc"; public int countSessionComplete(QaContent qa) { - List list = getSession().createQuery(COUNT_SESSION_COMPLETE).list(); + List list = getSessionFactory().getCurrentSession().createQuery(COUNT_SESSION_COMPLETE).list(); int sessionCount = 0; if (list != null && list.size() > 0) { @@ -57,7 +57,7 @@ */ public QaSession getQaSessionById(long qaSessionId) { String query = "from QaSession as qus where qus.qaSessionId = ?"; - List list = getSession().createQuery(query).setLong(0, qaSessionId).list(); + List list = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, qaSessionId).list(); if (list != null && list.size() > 0) { QaSession qus = (QaSession) list.get(0); @@ -70,23 +70,23 @@ * @see org.lamsfoundation.lams.tool.survey.dao.interfaces.ISurveySessionDAO#CreateSurveySession(com.lamsinternational.tool.survey.domain.SurveySession) */ public void createSession(QaSession session) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().save(session); } /** * @see org.lamsfoundation.lams.tool.survey.dao.interfaces.ISurveySessionDAO#UpdateSurveySession(com.lamsinternational.tool.survey.domain.SurveySession) */ public void UpdateQaSession(QaSession session) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().update(session); } /** * @see org.lamsfoundation.lams.tool.survey.dao.interfaces.ISurveySessionDAO#deleteSurveySession(com.lamsinternational.tool.survey.domain.SurveySession) */ public void deleteQaSession(QaSession qaSession) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(qaSession); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java =================================================================== diff -u -rc5457cc74f3986b393bc2947604b17168ba54dfb -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -28,7 +28,7 @@ import org.hibernate.FlushMode; import org.lamsfoundation.lams.tool.qa.QaUsrResp; import org.lamsfoundation.lams.tool.qa.dao.IQaUsrRespDAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @@ -44,7 +44,7 @@ + QaUsrResp.class.getName() + " as r where r.qaQuestion.qaContent.qaContentId=?"; public void createUserResponse(QaUsrResp qaUsrResp) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().save(qaUsrResp); } @@ -56,17 +56,17 @@ * @see org.lamsfoundation.lams.tool.qa.dao.IQaUsrRespDAO#updateUserResponse(org.lamsfoundation.lams.tool.qa.QaUsrResp) */ public void updateUserResponse(QaUsrResp resp) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().update(resp); } public void removeUserResponse(QaUsrResp resp) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(resp); } public QaUsrResp getResponseByUserAndQuestion(final Long queUsrId, final Long questionId) { - List list = getSession().createQuery(LOAD_ATTEMPT_FOR_USER_AND_QUESTION) + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_ATTEMPT_FOR_USER_AND_QUESTION) .setLong("queUsrId", queUsrId.longValue()).setLong("questionId", questionId.longValue()).list(); if (list == null || list.size() == 0) { return null; @@ -77,7 +77,7 @@ @Override public List getResponsesByUserUid(final Long userUid) { - List list = getSession().createQuery(LOAD_ATTEMPT_FOR_USER).setLong("userUid", userUid.longValue()) + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_ATTEMPT_FOR_USER).setLong("userUid", userUid.longValue()) .list(); return list; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/ResponseRatingDAO.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/ResponseRatingDAO.java (.../ResponseRatingDAO.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/ResponseRatingDAO.java (.../ResponseRatingDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -84,7 +84,7 @@ } public void removeResponseRating(ResponseRating rating) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(rating); } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/BaseDAOHibernate.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.lamsfoundation.lams.tool.rsrc.dao.DAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * This class serves as the Base class for all other DAOs - namely to hold Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionDAO.java =================================================================== diff -u -r17ddd3aac11d9fecc83159a9c829e989754accfb -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionDAO.java (.../LeaderselectionDAO.java) (revision 17ddd3aac11d9fecc83159a9c829e989754accfb) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionDAO.java (.../LeaderselectionDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -55,7 +55,7 @@ @Override public void releaseFromCache(Object o) { - getSession().evict(o); + getSessionFactory().getCurrentSession().evict(o); } } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java (.../MindmapDAO.java) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java (.../MindmapDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -64,7 +64,7 @@ } public void releaseFromCache(Object o) { - getSession().evict(o); + getSessionFactory().getCurrentSession().evict(o); } } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java =================================================================== diff -u -r567af22fafd6a56534cc071f3650eda4495d05ef -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java (.../NoticeboardContentDAO.java) (revision 567af22fafd6a56534cc071f3650eda4495d05ef) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java (.../NoticeboardContentDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -33,9 +33,9 @@ import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession; import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author mtruong @@ -110,13 +110,13 @@ { if ( nbContentId != null) { //String query = "from org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent as nb where nb.nbContentId=?"; - List list = getSession().createQuery(FIND_NB_CONTENT) + List list = getSessionFactory().getCurrentSession().createQuery(FIND_NB_CONTENT) .setLong(0,nbContentId.longValue()) .list(); if(list != null && list.size() > 0){ NoticeboardContent nb = (NoticeboardContent) list.get(0); - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(nb); this.getHibernateTemplate().flush(); } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java (.../NoticeboardSessionDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java (.../NoticeboardSessionDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -33,9 +33,9 @@ import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser; import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author mtruong @@ -89,13 +89,13 @@ HibernateTemplate templ = this.getHibernateTemplate(); if ( nbSessionId != null) { //String query = "from org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent as nb where nb.nbContentId=?"; - List list = getSession().createQuery(FIND_NB_SESSION) + List list = getSessionFactory().getCurrentSession().createQuery(FIND_NB_SESSION) .setLong(0,nbSessionId.longValue()) .list(); if(list != null && list.size() > 0){ NoticeboardSession nb = (NoticeboardSession) list.get(0); - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); templ.delete(nb); templ.flush(); } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java =================================================================== diff -u -r4aae0391a4892385de3df761a655e0ab8b1c0183 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java (.../NoticeboardUserDAO.java) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java (.../NoticeboardUserDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -30,8 +30,8 @@ import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession; /** @@ -68,7 +68,7 @@ /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO#getNbUserBySession(java.lang.Long, java.lang.Long)*/ public NoticeboardUser getNbUserBySession(Long userId, Long sessionId) { - List usersReturned = getSession().createQuery(FIND_NB_USER_BY_SESSION) + List usersReturned = getSessionFactory().getCurrentSession().createQuery(FIND_NB_USER_BY_SESSION) .setLong(0,userId.longValue()) .setLong(1, sessionId.longValue()) .list(); @@ -99,13 +99,13 @@ { if ( userId != null) { //String query = "from org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent as nb where nb.nbContentId=?"; - List list = getSession().createQuery(FIND_NB_USER) + List list = getSessionFactory().getCurrentSession().createQuery(FIND_NB_USER) .setLong(0,userId.longValue()) .list(); if(list != null && list.size() > 0){ NoticeboardUser nb = (NoticeboardUser) list.get(0); - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(nb); this.getHibernateTemplate().flush(); } Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java (.../NotebookDAO.java) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java (.../NotebookDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -52,7 +52,7 @@ } public void releaseFromCache(Object o) { - getSession().evict(o); + getSessionFactory().getCurrentSession().evict(o); } } Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrConfigItemDAO.java =================================================================== diff -u -rf31b75c40cca57454726c6f43dfba57cc2dae37c -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrConfigItemDAO.java (.../PixlrConfigItemDAO.java) (revision f31b75c40cca57454726c6f43dfba57cc2dae37c) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrConfigItemDAO.java (.../PixlrConfigItemDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -5,7 +5,7 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.pixlr.dao.IPixlrConfigItemDAO; import org.lamsfoundation.lams.tool.pixlr.model.PixlrConfigItem; -import org.springframework.orm.hibernate3.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateCallback; public class PixlrConfigItemDAO extends BaseDAO implements IPixlrConfigItemDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = "from PixlrConfigItem configuration" Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java (.../PixlrDAO.java) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java (.../PixlrDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -30,7 +30,7 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.pixlr.dao.IPixlrDAO; import org.lamsfoundation.lams.tool.pixlr.model.Pixlr; -import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate4.HibernateTemplate; /** * DAO for accessing the Pixlr objects - Hibernate specific code. @@ -55,7 +55,7 @@ } public void releaseFromCache(Object o) { - getSession().evict(o); + getSessionFactory().getCurrentSession().evict(o); } } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java (.../SubmissionDetailsDAO.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java (.../SubmissionDetailsDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -65,7 +65,7 @@ */ public List getSubmissionDetailsBySession(Long sessionID) { if ( sessionID != null ) { - return this.getSession().createQuery(FIND_BY_SESSION) + return getSessionFactory().getCurrentSession().createQuery(FIND_BY_SESSION) .setLong(0, sessionID.longValue()) .list(); } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java (.../SubmitFilesSessionDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java (.../SubmitFilesSessionDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -59,7 +59,7 @@ public List getSubmitFilesSessionByContentID(Long contentID){ if ( contentID != null ) { - return this.getSession().createQuery(FIND_LEARNER_BY_CONTENT_ID) + return getSessionFactory().getCurrentSession().createQuery(FIND_LEARNER_BY_CONTENT_ID) .setLong("contentID", contentID.longValue()) .list(); } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BaseDAOHibernate.java =================================================================== diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.lamsfoundation.lams.tool.scratchie.dao.DAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * This class serves as the Base class for all other DAOs - namely to hold Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java =================================================================== diff -u -re5a3c4e8e88340e636c501f79cec1b91ab59a5cf -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java (.../ScratchieConfigItemDAOHibernate.java) (revision e5a3c4e8e88340e636c501f79cec1b91ab59a5cf) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java (.../ScratchieConfigItemDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -28,7 +28,7 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.scratchie.dao.ScratchieConfigItemDAO; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieConfigItem; -import org.springframework.orm.hibernate3.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateCallback; public class ScratchieConfigItemDAOHibernate extends BaseDAO implements ScratchieConfigItemDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = "from ScratchieConfigItem configuration" Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/BaseDAOHibernate.java =================================================================== diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.lamsfoundation.lams.tool.spreadsheet.dao.DAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * This class serves as the Base class for all other DAOs - namely to hold Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/BaseDAOHibernate.java =================================================================== diff -u -rf0c3f41d54ef4f390ef3f93f28c0679c46b6730c -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision f0c3f41d54ef4f390ef3f93f28c0679c46b6730c) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.lamsfoundation.lams.tool.survey.dao.DAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * This class serves as the Base class for all other DAOs - namely to hold Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/BaseDAOHibernate.java =================================================================== diff -u -r0e7e464ded505f35e6ade3811f3f74658668e13a -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.lamsfoundation.lams.tool.taskList.dao.DAO; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * This class serves as the Base class for all other DAOs - namely to hold Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderDAO.java =================================================================== diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderDAO.java (.../VideoRecorderDAO.java) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderDAO.java (.../VideoRecorderDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -52,7 +52,7 @@ } public void releaseFromCache(Object o) { - getSession().evict(o); + getSessionFactory().getCurrentSession().evict(o); } } Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRatingDAO.java =================================================================== diff -u -r15045d0b9b0dbb930f42a9da7757207e7a325341 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRatingDAO.java (.../VideoRecorderRatingDAO.java) (revision 15045d0b9b0dbb930f42a9da7757207e7a325341) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRatingDAO.java (.../VideoRecorderRatingDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -34,7 +34,7 @@ import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderComment; import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRating; import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRecording; -import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate4.HibernateTemplate; /** * DAO for accessing the VideoRecorderRating objects - Hibernate specific code. Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java =================================================================== diff -u -r15045d0b9b0dbb930f42a9da7757207e7a325341 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java (.../VideoRecorderRecordingDAO.java) (revision 15045d0b9b0dbb930f42a9da7757207e7a325341) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/dao/hibernate/VideoRecorderRecordingDAO.java (.../VideoRecorderRecordingDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,7 +29,7 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.videoRecorder.dao.IVideoRecorderRecordingDAO; import org.lamsfoundation.lams.tool.videoRecorder.model.VideoRecorderRecording; -import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate4.HibernateTemplate; /** * DAO for accessing the VideoRecorderRecording objects - Hibernate specific code. Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java =================================================================== diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java (.../VoteContentDAO.java) (revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java (.../VoteContentDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -32,9 +32,9 @@ import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteSession; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author Ozgur Demirtas @@ -57,14 +57,14 @@ } public void saveOrUpdateVote(VoteContent vote) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().saveOrUpdate(vote); } public VoteContent getVoteContentByContentId(Long voteContentId) { String query = "from VoteContent as vote where vote.voteContentId = ?"; HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(query).setLong(0, voteContentId.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, voteContentId.longValue()).list(); if (list != null && list.size() > 0) { VoteContent vote = (VoteContent) list.get(0); @@ -84,24 +84,24 @@ } public void saveVoteContent(VoteContent voteContent) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().saveOrUpdate(voteContent); } public void updateVoteContent(VoteContent voteContent) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().update(voteContent); } public void removeVoteById(Long voteContentId) { HibernateTemplate templ = this.getHibernateTemplate(); if (voteContentId != null) { - List list = getSession().createQuery(VoteContentDAO.FIND_VOTE_CONTENT) + List list = getSessionFactory().getCurrentSession().createQuery(VoteContentDAO.FIND_VOTE_CONTENT) .setLong(0, voteContentId.longValue()).list(); if (list != null && list.size() > 0) { VoteContent vote = (VoteContent) list.get(0); - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); templ.delete(vote); templ.flush(); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java =================================================================== diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java (.../VoteQueContentDAO.java) (revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java (.../VoteQueContentDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -26,7 +26,7 @@ import org.hibernate.FlushMode; import org.lamsfoundation.lams.tool.vote.dao.IVoteQueContentDAO; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * Hibernate implementation for database access to VoteQueContent for the vote @@ -52,7 +52,7 @@ @Override public VoteQueContent getDefaultVoteContentFirstQuestion() { final long voteContentId = 1; - List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID).setLong("voteContentId", + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID).setLong("voteContentId", voteContentId).list(); if (list != null && list.size() > 0) { @@ -64,7 +64,7 @@ @Override public VoteQueContent getQuestionByDisplayOrder(final Long displayOrder, final Long voteContentUid) { - List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER).setLong("displayOrder", + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER).setLong("displayOrder", displayOrder.longValue()).setLong("voteContentUid", voteContentUid.longValue()).list(); if (list != null && list.size() > 0) { @@ -76,7 +76,7 @@ @Override public List getAllQuestionsSorted(final long voteContentId) { - List list = getSession().createQuery(SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER).setLong("voteContentId", + List list = getSessionFactory().getCurrentSession().createQuery(SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER).setLong("voteContentId", voteContentId).list(); return list; @@ -94,7 +94,7 @@ @Override public void removeQuestion(VoteQueContent voteQueContent) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(voteQueContent); } } \ No newline at end of file Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java (.../VoteSessionDAO.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java (.../VoteSessionDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -31,9 +31,9 @@ import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr; import org.lamsfoundation.lams.tool.vote.pojos.VoteSession; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author ozgurd @@ -63,7 +63,7 @@ public VoteSession getSessionBySessionId(Long voteSessionId) { String query = "from VoteSession votes where votes.voteSessionId=?"; - List list = getSession().createQuery(query).setLong(0, voteSessionId.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, voteSessionId.longValue()).list(); if (list != null && list.size() > 0) { VoteSession vote = (VoteSession) list.get(0); @@ -73,7 +73,7 @@ } public int countSessionComplete() { - List list = getSession().createQuery(COUNT_SESSION_COMPLETE).list(); + List list = getSessionFactory().getCurrentSession().createQuery(COUNT_SESSION_COMPLETE).list(); if (list != null && list.size() > 0) { return list.size(); @@ -86,7 +86,7 @@ } public void updateVoteSession(VoteSession voteSession) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().update(voteSession); } @@ -99,12 +99,12 @@ HibernateTemplate templ = this.getHibernateTemplate(); if (voteSessionId != null) { - List list = getSession().createQuery(FIND_VOTE_SESSION_CONTENT).setLong(0, voteSessionId.longValue()) + List list = getSessionFactory().getCurrentSession().createQuery(FIND_VOTE_SESSION_CONTENT).setLong(0, voteSessionId.longValue()) .list(); if (list != null && list.size() > 0) { VoteSession vote = (VoteSession) list.get(0); - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); templ.delete(vote); templ.flush(); } @@ -113,7 +113,7 @@ } public void removeVoteSession(VoteSession voteSession) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(voteSession); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java =================================================================== diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java (.../VoteUserDAO.java) (revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java (.../VoteUserDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -29,8 +29,8 @@ import org.lamsfoundation.lams.tool.vote.dao.IVoteUserDAO; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr; import org.lamsfoundation.lams.tool.vote.pojos.VoteSession; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * @author Ozgur Demirtas @@ -50,7 +50,7 @@ public VoteQueUsr getVoteUserByUID(Long uid) { String query = "from VoteQueUsr user where user.uid=?"; - List list = getSession().createQuery(query).setLong(0, uid.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, uid.longValue()).list(); if (list != null && list.size() > 0) { VoteQueUsr voteu = (VoteQueUsr) list.get(0); @@ -62,7 +62,7 @@ public VoteQueUsr getUserByUserId(Long userId) { String query = "from VoteQueUsr user where user.queUsrId=?"; - List list = getSession().createQuery(query).setLong(0, userId.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, userId.longValue()).list(); if (list != null && list.size() > 0) { VoteQueUsr voteu = (VoteQueUsr) list.get(0); @@ -72,13 +72,13 @@ } public List getVoteUserBySessionUid(final Long voteSessionUid) { - List list = getSession().createQuery(LOAD_USER_FOR_SESSION) + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_USER_FOR_SESSION) .setLong("voteSessionId", voteSessionUid.longValue()).list(); return list; } public int getCompletedVoteUserBySessionUid(final Long voteSessionUid) { - List list = getSession().createQuery(LOAD_USER_FOR_SESSION) + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_USER_FOR_SESSION) .setLong("voteSessionId", voteSessionUid.longValue()).list(); int completedSessionUserCount = 0; @@ -98,7 +98,7 @@ public VoteQueUsr getVoteUserBySession(final Long queUsrId, final Long voteSessionId) { String strGetUser = "from voteQueUsr in class VoteQueUsr where voteQueUsr.queUsrId=:queUsrId and voteQueUsr.voteSessionId=:voteSessionId"; - List list = getSession().createQuery(strGetUser).setLong("queUsrId", queUsrId.longValue()) + List list = getSessionFactory().getCurrentSession().createQuery(strGetUser).setLong("queUsrId", queUsrId.longValue()) .setLong("voteSessionId", voteSessionId.longValue()).list(); if (list != null && list.size() > 0) { @@ -111,7 +111,7 @@ public VoteQueUsr getVoteQueUsrById(long voteQueUsrId) { String query = "from VoteQueUsr user where user.queUsrId=?"; - List list = getSession().createQuery(query).setLong(0, voteQueUsrId).list(); + List list = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, voteQueUsrId).list(); if (list != null && list.size() > 0) { VoteQueUsr qu = (VoteQueUsr) list.get(0); @@ -131,11 +131,11 @@ public void removeVoteUserById(Long userId) { HibernateTemplate templ = this.getHibernateTemplate(); if (userId != null) { - List list = getSession().createQuery(FIND_VOTE_USR_CONTENT).setLong(0, userId.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(FIND_VOTE_USR_CONTENT).setLong(0, userId.longValue()).list(); if (list != null && list.size() > 0) { VoteQueUsr voteu = (VoteQueUsr) list.get(0); - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); templ.delete(voteu); templ.flush(); } @@ -144,13 +144,13 @@ } public List getUserBySessionOnly(final VoteSession voteSession) { - List list = getSession().createQuery(LOAD_USER_FOR_SESSION) + List list = getSessionFactory().getCurrentSession().createQuery(LOAD_USER_FOR_SESSION) .setLong("voteSessionId", voteSession.getUid().longValue()).list(); return list; } public void removeVoteUser(VoteQueUsr voteUser) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(voteUser); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java =================================================================== diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -31,8 +31,8 @@ import org.hibernate.FlushMode; import org.lamsfoundation.lams.tool.vote.dao.IVoteUsrAttemptDAO; import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; +import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.orm.hibernate4.support.HibernateDaoSupport; /** * Hibernate implementation for database access to VoteUsrAttemptDAO for the voting tool. @@ -70,7 +70,7 @@ public VoteUsrAttempt getAttemptByUID(Long uid) { String query = "from VoteUsrAttempt attempt where attempt.uid=?"; - List list = getSession().createQuery(query).setLong(0, uid.longValue()).list(); + List list = getSessionFactory().getCurrentSession().createQuery(query).setLong(0, uid.longValue()).list(); if ((list != null) && (list.size() > 0)) { VoteUsrAttempt attempt = list.get(0); @@ -86,22 +86,22 @@ @Override public List getAttemptsForUser(final Long queUsrId) { - List list = getSession().createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_USER) + List list = getSessionFactory().getCurrentSession().createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_USER) .setLong("queUsrId", queUsrId.longValue()).list(); return list; } @Override public int getUserEnteredVotesCountForContent(final Long voteContentUid) { - List result = getSession().createQuery(VoteUsrAttemptDAO.COUNT_ATTEMPTS_BY_CONTENT_ID) + List result = getSessionFactory().getCurrentSession().createQuery(VoteUsrAttemptDAO.COUNT_ATTEMPTS_BY_CONTENT_ID) .setLong("voteContentId", voteContentUid).list(); Long resultLong = result.get(0) != null ? (Long) result.get(0) : new Long(0); return resultLong.intValue(); } @Override public Set getUserEntries(final Long voteContentUid) { - List list = getSession().createQuery(VoteUsrAttemptDAO.LOAD_USER_ENTRIES) + List list = getSessionFactory().getCurrentSession().createQuery(VoteUsrAttemptDAO.LOAD_USER_ENTRIES) .setLong("voteContentUid", voteContentUid).list(); Set userEntries = new HashSet(); @@ -119,14 +119,14 @@ @Override public List getUserAttempts(final Long voteContentUid, final String userEntry) { - List list = getSession().createQuery(VoteUsrAttemptDAO.LOAD_USER_ENTRY_RECORDS) + List list = getSessionFactory().getCurrentSession().createQuery(VoteUsrAttemptDAO.LOAD_USER_ENTRY_RECORDS) .setLong("voteContentUid", voteContentUid).setString("userEntry", userEntry).list(); return list; } @Override public Set getSessionUserEntriesSet(final Long voteSessionUid) { - List list = getSession().createQuery(VoteUsrAttemptDAO.LOAD_ENTRIES_BY_SESSION_UID) + List list = getSessionFactory().getCurrentSession().createQuery(VoteUsrAttemptDAO.LOAD_ENTRIES_BY_SESSION_UID) .setLong("voteSessionUid", voteSessionUid).list(); Set sessionUserEntries = new HashSet(); @@ -138,14 +138,14 @@ public void removeAttemptsForUserandSession(final Long queUsrId, final Long sessionUid) { String strGetUser = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.queUsrId=:queUsrId and voteUsrAttempt.voteQueUsr.voteSession.uid=:sessionUid"; HibernateTemplate templ = this.getHibernateTemplate(); - List list = getSession().createQuery(strGetUser).setLong("queUsrId", queUsrId.longValue()) + List list = getSessionFactory().getCurrentSession().createQuery(strGetUser).setLong("queUsrId", queUsrId.longValue()) .setLong("sessionUid", sessionUid).list(); if ((list != null) && (list.size() > 0)) { Iterator listIterator = list.iterator(); while (listIterator.hasNext()) { VoteUsrAttempt attempt = listIterator.next(); - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); templ.delete(attempt); templ.flush(); } @@ -154,7 +154,7 @@ @Override public int getAttemptsForQuestionContent(final Long questionUid) { - List list = getSession().createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_QUESTION_CONTENT) + List list = getSessionFactory().getCurrentSession().createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_QUESTION_CONTENT) .setLong("voteQueContentId", questionUid.longValue()).list(); if ((list != null) && (list.size() > 0)) { @@ -173,7 +173,7 @@ @Override public List getAttemptsForQuestionContentAndSessionUid(final Long questionUid, final Long sessionUid) { - List list = getSession() + List list = getSessionFactory().getCurrentSession() .createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_QUESTION_CONTENT_AND_SESSION) .setLong("voteQueContentId", questionUid.longValue()) .setLong("sessionUid", sessionUid.longValue()).list(); @@ -188,15 +188,15 @@ @Override public List getStandardAttemptsByQuestionUid(final Long questionUid) { - List list = getSession().createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_QUESTION_CONTENT) + List list = getSessionFactory().getCurrentSession().createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_QUESTION_CONTENT) .setLong("voteQueContentId", questionUid.longValue()).list(); return list; } @Override public List getAttemptsForUserAndQuestionContent(final Long queUsrId, final Long questionUid) { - List list = getSession() + List list = getSessionFactory().getCurrentSession() .createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT) .setLong("queUsrId", queUsrId.longValue()).setLong("voteQueContentId", questionUid.longValue()) .list(); @@ -207,7 +207,7 @@ @Override public VoteUsrAttempt getAttemptForUserAndQuestionContentAndSession(final Long queUsrId, final Long questionUid, final Long sessionUid) { - List list = getSession() + List list = getSessionFactory().getCurrentSession() .createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT_AND_SESSION) .setLong("queUsrId", queUsrId.longValue()).setLong("voteQueContentId", questionUid.longValue()) .setLong("sessionUid", sessionUid.longValue()).list(); @@ -221,7 +221,7 @@ @Override public Set getAttemptsForUserAndSession(final Long queUsrId, final Long sessionUid) { - List list = getSession().createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_USER_AND_SESSION) + List list = getSessionFactory().getCurrentSession().createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_USER_AND_SESSION) .setLong("queUsrId", queUsrId.longValue()).setLong("sessionUid", sessionUid.longValue()).list(); Set userEntries = new HashSet(); @@ -242,7 +242,7 @@ @Override public Set getAttemptsForUserAndSessionUseOpenAnswer(final Long queUsrId, final Long sessionUid) { - List list = getSession().createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_USER_AND_SESSION) + List list = getSessionFactory().getCurrentSession().createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_USER_AND_SESSION) .setLong("queUsrId", queUsrId.longValue()).setLong("sessionUid", sessionUid.longValue()).list(); String openAnswer = ""; @@ -271,21 +271,21 @@ @Override public int getSessionEntriesCount(final Long voteSessionUid) { - List result = getSession().createQuery(VoteUsrAttemptDAO.COUNT_ENTRIES_BY_SESSION_ID) + List result = getSessionFactory().getCurrentSession().createQuery(VoteUsrAttemptDAO.COUNT_ENTRIES_BY_SESSION_ID) .setLong("voteSessionUid", voteSessionUid).list(); Long resultLong = result.get(0) != null ? (Long) result.get(0) : new Long(0); return resultLong.intValue(); } @Override public void updateVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().update(voteUsrAttempt); } @Override public void removeVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt) { - this.getSession().setFlushMode(FlushMode.AUTO); + getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO); this.getHibernateTemplate().delete(voteUsrAttempt); } } \ No newline at end of file Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java =================================================================== diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java (.../WikiDAO.java) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java (.../WikiDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -34,7 +34,7 @@ import org.lamsfoundation.lams.tool.wiki.dao.IWikiDAO; import org.lamsfoundation.lams.tool.wiki.model.Wiki; import org.lamsfoundation.lams.tool.wiki.model.WikiPage; -import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate4.HibernateTemplate; /** * DAO for accessing the Wiki objects - Hibernate specific code. Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java =================================================================== diff -u -rfbaed90461a821c04884823a4c5791176a951c71 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java (.../WikiPageDAO.java) (revision fbaed90461a821c04884823a4c5791176a951c71) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java (.../WikiPageDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -30,7 +30,7 @@ public WikiPage getByWikiAndTitle(Wiki wiki, String title) { if (wiki != null && title != null && title.length() > 0) { Long wikiId = wiki.getUid(); - Query query = this.getSession().createQuery(GET_BY_WIKI_AND_TITLE); + Query query = getSessionFactory().getCurrentSession().createQuery(GET_BY_WIKI_AND_TITLE); query.setLong(0, wikiId); query.setString(1, title); return (WikiPage) query.uniqueResult(); @@ -41,7 +41,7 @@ public WikiPage getBySessionAndTitle(WikiSession wikiSession, String title) { if (wikiSession != null && title != null && title.length() > 0) { Long wikiId = wikiSession.getUid(); - Query query = this.getSession().createQuery(GET_BY_SESSION_AND_TITLE); + Query query = getSessionFactory().getCurrentSession().createQuery(GET_BY_SESSION_AND_TITLE); query.setLong(0, wikiId); query.setString(1, title); return (WikiPage) query.uniqueResult(); @@ -57,7 +57,7 @@ String codeToReplace = WikiPageDAO.CHANGE_WIKI_JAVASCRIPT_METHOD.replace("?", escapedTitle); String replacementCode = "#"; - SQLQuery query = this.getSession().createSQLQuery(REMOVE_WIKI_REFERENCES); + SQLQuery query = getSessionFactory().getCurrentSession().createSQLQuery(REMOVE_WIKI_REFERENCES); query.setString(0, codeToReplace); query.setString(1, replacementCode); query.setLong(2, removedWikiPage.getParentWiki().getUid()); Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieConfigItemDAO.java =================================================================== diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieConfigItemDAO.java (.../WookieConfigItemDAO.java) (revision 7c52d117dbe910bd67630b5506346429e25b99a9) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieConfigItemDAO.java (.../WookieConfigItemDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -5,7 +5,7 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.wookie.dao.IWookieConfigItemDAO; import org.lamsfoundation.lams.tool.wookie.model.WookieConfigItem; -import org.springframework.orm.hibernate3.HibernateCallback; +import org.springframework.orm.hibernate4.HibernateCallback; public class WookieConfigItemDAO extends BaseDAO implements IWookieConfigItemDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = "from WookieConfigItem configuration" Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieDAO.java =================================================================== diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieDAO.java (.../WookieDAO.java) (revision 8b97231e320c0c5b674f07c14da711f232ba9e1c) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieDAO.java (.../WookieDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) @@ -53,7 +53,7 @@ } public void releaseFromCache(Object o) { - getSession().evict(o); + getSessionFactory().getCurrentSession().evict(o); } }