Index: lams_common/src/java/org/lamsfoundation/lams/config/dao/IConfigurationDAO.java =================================================================== diff -u -re0b070e11b6c51b15b0f39906c8e3536f8ac09f0 -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/config/dao/IConfigurationDAO.java (.../IConfigurationDAO.java) (revision e0b070e11b6c51b15b0f39906c8e3536f8ac09f0) +++ lams_common/src/java/org/lamsfoundation/lams/config/dao/IConfigurationDAO.java (.../IConfigurationDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -26,13 +26,14 @@ import java.util.List; import org.lamsfoundation.lams.config.ConfigurationItem; +import org.lamsfoundation.lams.dao.IBaseDAO; /** * * @author Mitchell Seaton * */ -public interface IConfigurationDAO { +public interface IConfigurationDAO extends IBaseDAO { public List getAllItems(); Index: lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java (.../ConfigurationDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java (.../ConfigurationDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -25,19 +25,18 @@ import java.util.List; -import org.hibernate.HibernateException; -import org.hibernate.Session; import org.lamsfoundation.lams.config.ConfigurationItem; import org.lamsfoundation.lams.config.dao.IConfigurationDAO; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; -import org.springframework.orm.hibernate4.HibernateCallback; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; +import org.springframework.stereotype.Repository; /** * * @author Mitchell Seaton * */ -public class ConfigurationDAO extends BaseDAO implements IConfigurationDAO { +@Repository +public class ConfigurationDAO extends LAMSBaseDAO implements IConfigurationDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = "from configuration in class " + ConfigurationItem.class.getName() + " where configuration.key=:key"; @@ -55,12 +54,7 @@ */ @Override public ConfigurationItem getConfigItemByKey(final String configKey) { - return (ConfigurationItem) getHibernateTemplate().execute(new HibernateCallback() { - @Override - public Object doInHibernate(Session session) throws HibernateException { - return session.createQuery(ConfigurationDAO.LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey) - .uniqueResult(); - } - }); + return (ConfigurationItem) getSession().createQuery(ConfigurationDAO.LOAD_CONFIG_ITEM_BY_KEY) + .setString("key", configKey).uniqueResult(); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/RegistrationDAO.java =================================================================== diff -u -r10fb21d005787bd5ce368653e26504ee447f40fb -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/RegistrationDAO.java (.../RegistrationDAO.java) (revision 10fb21d005787bd5ce368653e26504ee447f40fb) +++ lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/RegistrationDAO.java (.../RegistrationDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -27,25 +27,27 @@ import org.lamsfoundation.lams.config.Registration; import org.lamsfoundation.lams.config.dao.IRegistrationDAO; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; +import org.springframework.stereotype.Repository; -public class RegistrationDAO extends BaseDAO implements IRegistrationDAO { +@Repository +public class RegistrationDAO extends LAMSBaseDAO implements IRegistrationDAO { private static final String LOAD_REG = "from registration in class " + Registration.class.getName(); public void saveOrUpdate(Registration reg) { - getHibernateTemplate().saveOrUpdate(reg); + saveOrUpdate(reg); } - @SuppressWarnings("unchecked") - public Registration get() { - List list = getHibernateTemplate().find(LOAD_REG); + @SuppressWarnings("unchecked") + public Registration get() { + List list = doFind(LOAD_REG); - if (list != null && list.size() > 0) { - return (Registration) list.get(0); - } else { - return null; + if (list != null && list.size() > 0) { + return (Registration) list.get(0); + } else { + return null; + } } - } } Index: lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java =================================================================== diff -u -r6aa690bf607abaecf665c15c8f4525c53f475487 -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java (.../LogEventDAO.java) (revision 6aa690bf607abaecf665c15c8f4525c53f475487) +++ lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java (.../LogEventDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -26,17 +26,19 @@ import java.util.Date; import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.logevent.LogEvent; import org.lamsfoundation.lams.logevent.dao.ILogEventDAO; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of ILogEventDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.timezone.dao.ILogEventDAO */ -public class LogEventDAO extends BaseDAO implements ILogEventDAO { +@Repository +public class LogEventDAO extends LAMSBaseDAO implements ILogEventDAO { private static final String GET_LOG_EVENT_BY_ID = "from " + LogEvent.class.getName() + "where id = ?"; @@ -52,7 +54,7 @@ } public LogEvent getById(Long logEventId) { - List list = getHibernateTemplate().find(GET_LOG_EVENT_BY_ID, logEventId); + List list = doFind(GET_LOG_EVENT_BY_ID, logEventId); if (list.size() > 0) { return (LogEvent) list.get(0); } else { @@ -62,12 +64,12 @@ @SuppressWarnings("unchecked") public List getByUser(Integer userId) { - return (List) getHibernateTemplate().find(GET_LOG_EVENT_BY_USER, userId); + return (List) doFind(GET_LOG_EVENT_BY_USER, userId); } @SuppressWarnings("unchecked") public List getEventsOccurredBetween(Date startDate, Date finishDate) { - return (List) getHibernateTemplate().find(GET_LOG_EVENTS_OCCURED_BETWEEN_DATES, startDate, finishDate); + return (List) doFind(GET_LOG_EVENTS_OCCURED_BETWEEN_DATES, startDate, finishDate); } } Index: lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java =================================================================== diff -u -r8cbd631849cddfbfc7fb887e8a847894e5baaefa -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java (.../LogEventService.java) (revision 8cbd631849cddfbfc7fb887e8a847894e5baaefa) +++ lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java (.../LogEventService.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -27,20 +27,10 @@ import java.util.List; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.events.IEventNotificationService; -import org.lamsfoundation.lams.events.ResendMessagesJob; import org.lamsfoundation.lams.logevent.LogEvent; import org.lamsfoundation.lams.logevent.dao.ILogEventDAO; -import org.lamsfoundation.lams.logevent.dao.hibernate.LogEventDAO; import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.usermanagement.exception.UserException; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.usermanagement.service.UserManagementService; -import org.quartz.JobDetail; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.SimpleTrigger; -import org.quartz.Trigger; /** * Class implements ILogEventService. @@ -110,7 +100,7 @@ * @param logEventDAO * The logEventDAO to set. */ - public void setLogEventDAO(LogEventDAO logEventDAO) { + public void setLogEventDAO(ILogEventDAO logEventDAO) { this.logEventDAO = logEventDAO; } Index: lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java =================================================================== diff -u -r38a6c414e30497d03559a85b5c33155e4a2fc22e -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java (.../NotebookEntryDAO.java) (revision 38a6c414e30497d03559a85b5c33155e4a2fc22e) +++ lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java (.../NotebookEntryDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -27,11 +27,13 @@ import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.notebook.dao.INotebookEntryDAO; import org.lamsfoundation.lams.notebook.model.NotebookEntry; +import org.springframework.stereotype.Repository; -public class NotebookEntryDAO extends BaseDAO implements INotebookEntryDAO { +@Repository +public class NotebookEntryDAO extends LAMSBaseDAO implements INotebookEntryDAO { private static final String SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_SIG = "from " + NotebookEntry.class.getName() + " where external_id=? and external_id_type=? and external_signature=? and user_id=?" @@ -50,37 +52,37 @@ public void saveOrUpdate(NotebookEntry notebookEntry) { - this.getHibernateTemplate().saveOrUpdate(notebookEntry); - this.getHibernateTemplate().flush(); + this.saveOrUpdate(notebookEntry); + this.getSession().flush(); } public List get(Long id, Integer idType, String signature, Integer userID) { - return (List)(getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_SIG, new Object[]{id, idType, signature, userID})); + return (List)(doFind(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_SIG, new Object[]{id, idType, signature, userID})); } public List get(Long id, Integer idType, String signature) { - return (List)(getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_SIG_ALL, new Object[]{id, idType, signature})); + return (List)(doFind(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_SIG_ALL, new Object[]{id, idType, signature})); } public List get(Long id, Integer idType, Integer userID) { - return (List)(getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID, new Object[]{id, idType, userID})); + return (List)(doFind(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID, new Object[]{id, idType, userID})); } public NotebookEntry get(Long uid) { if (uid != null) { - Object o = getHibernateTemplate().get(NotebookEntry.class, uid); + Object o = getSession().get(NotebookEntry.class, uid); return (NotebookEntry)o; } else { return null; } } public List get(Integer userID) { - return (List)(getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_USER_ID, userID)); + return (List)(doFind(SQL_QUERY_FIND_ENTRY_BY_USER_ID, userID)); } public List get(Integer userID, Integer idType) { - return (List)(getHibernateTemplate().find(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_TYPE, new Object[]{userID, idType})); + return (List)(doFind(SQL_QUERY_FIND_ENTRY_BY_EXTERNAL_ID_TYPE, new Object[]{userID, idType})); } public List get(Integer userID, Long lessonID) { Index: lams_common/src/java/org/lamsfoundation/lams/presence/dao/hibernate/PresenceChatDAO.java =================================================================== diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/presence/dao/hibernate/PresenceChatDAO.java (.../PresenceChatDAO.java) (revision 2aaccb954583cd8431759dca8e912a8fe863aa0e) +++ lams_common/src/java/org/lamsfoundation/lams/presence/dao/hibernate/PresenceChatDAO.java (.../PresenceChatDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -28,12 +28,14 @@ import java.util.Date; import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.presence.dao.IPresenceChatDAO; import org.lamsfoundation.lams.presence.model.PresenceChatMessage; import org.lamsfoundation.lams.presence.model.PresenceChatUser; +import org.springframework.stereotype.Repository; -public class PresenceChatDAO extends BaseDAO implements IPresenceChatDAO { +@Repository +public class PresenceChatDAO extends LAMSBaseDAO implements IPresenceChatDAO { private static final String MESSAGE_BY_MESSAGE_ID = "from " + PresenceChatMessage.class.getName() + " msg" + " where msg.uid=?"; @@ -62,14 +64,14 @@ @Override public void saveOrUpdate(Object object) { - this.getHibernateTemplate().saveOrUpdate(object); - this.getHibernateTemplate().flush(); + this.saveOrUpdate(object); + this.getSession().flush(); } @Override @SuppressWarnings("unchecked") public PresenceChatMessage getMessageById(Long id) { - List list = (List) (getHibernateTemplate().find(PresenceChatDAO.MESSAGE_BY_CONVERSATION, + List list = (List) (doFind(PresenceChatDAO.MESSAGE_BY_CONVERSATION, new Object[] { id })); if (!list.isEmpty()) { @@ -82,29 +84,29 @@ @Override @SuppressWarnings("unchecked") public List getMessagesByConversation(Long lessonId, String from, String to) { - return (List) (getHibernateTemplate().findByNamedParam(PresenceChatDAO.MESSAGE_BY_CONVERSATION, new String[] { "from", + return (List) (doFindByNamedParam(PresenceChatDAO.MESSAGE_BY_CONVERSATION, new String[] { "from", "to", "lessonId" }, new Object[] { from, to, lessonId })); } @Override @SuppressWarnings("unchecked") public List getMessagesByLessonId(Long lessonId) { - return (List) (getHibernateTemplate().find(PresenceChatDAO.MESSAGE_BY_LESSON_ID, new Object[] { lessonId })); + return (List) (doFind(PresenceChatDAO.MESSAGE_BY_LESSON_ID, new Object[] { lessonId })); } @Override @SuppressWarnings("unchecked") public List getNewMessages(Long lessonId, String from, String to, Long lastMessageUid, Date lastCheck) { - return (List) (getHibernateTemplate().findByNamedParam(PresenceChatDAO.MESSAGE_NEW, new String[] { "lessonId", "from", + return (List) (doFindByNamedParam(PresenceChatDAO.MESSAGE_NEW, new String[] { "lessonId", "from", "to", "lastMessageUid", "lastCheck" }, new Object[] { lessonId, from, to == null ? "NULL" : to, lastMessageUid == null ? 0 : lastMessageUid, lastCheck == null ? new Date(0) : lastCheck })); } @Override @SuppressWarnings("unchecked") public List getUsersByLessonIdAndLastPresence(Long lessonId, Date oldestLastPresence) { - return (List) this.getHibernateTemplate().find(PresenceChatDAO.USER_BY_LESSON_ID_AND_TIME, + return (List) this.doFind(PresenceChatDAO.USER_BY_LESSON_ID_AND_TIME, new Object[] { lessonId, oldestLastPresence }); } Index: lams_common/src/java/org/lamsfoundation/lams/signup/dao/hibernate/SignupDAO.java =================================================================== diff -u -r2b88dada3266a4b0f83f4b5c4cf617553496ca59 -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/signup/dao/hibernate/SignupDAO.java (.../SignupDAO.java) (revision 2b88dada3266a4b0f83f4b5c4cf617553496ca59) +++ lams_common/src/java/org/lamsfoundation/lams/signup/dao/hibernate/SignupDAO.java (.../SignupDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -2,18 +2,20 @@ import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.signup.dao.ISignupDAO; import org.lamsfoundation.lams.signup.model.SignupOrganisation; import org.lamsfoundation.lams.usermanagement.OrganisationState; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.User; +import org.springframework.stereotype.Repository; -public class SignupDAO extends BaseDAO implements ISignupDAO { +@Repository +public class SignupDAO extends LAMSBaseDAO implements ISignupDAO { @Override public SignupOrganisation getSignupOrganisation(String context) { - List list = getHibernateTemplate().find( + List list = doFind( "from SignupOrganisation s where s.disabled=" + Boolean.FALSE + " and s.context=?", context); if (list != null && list.size() > 0) { return (SignupOrganisation) list.get(0); @@ -30,7 +32,7 @@ public List getOrganisationCandidates() { String query = "from Organisation o where o.organisationState.organisationStateId=" + OrganisationState.ACTIVE; query += " and o.organisationType.organisationTypeId!=" + OrganisationType.ROOT_TYPE; - return getHibernateTemplate().find(query); + return doFind(query); } @Override @@ -48,7 +50,7 @@ Object[] values = new Object[2]; values[0] = soid; values[1] = context; - List list = getHibernateTemplate().find(query, values); + List list = doFind(query, values); if (list != null && list.size() > 0) return true; else @@ -61,7 +63,7 @@ Object[] values = new Object[2]; values[0] = context; values[1] = courseKey; - List list = getHibernateTemplate().find(query, values); + List list = doFind(query, values); if (list != null && list.size() > 0) return true; else Index: lams_common/src/java/org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java =================================================================== diff -u -r009fbce36f45d0929f8007c4bbc798242f57d3af -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java (.../TimezoneDAO.java) (revision 009fbce36f45d0929f8007c4bbc798242f57d3af) +++ lams_common/src/java/org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java (.../TimezoneDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -25,17 +25,19 @@ import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.timezone.Timezone; import org.lamsfoundation.lams.timezone.dao.ITimezoneDAO; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of ITimezoneDAO. * * @author Andrey Balan * @see org.lamsfoundation.lams.timezone.dao.ITimezoneDAO */ -public class TimezoneDAO extends BaseDAO implements ITimezoneDAO { +@Repository +public class TimezoneDAO extends LAMSBaseDAO implements ITimezoneDAO { private final static String FIND_DEFAULT_TIMEZONES = "from " + Timezone.class.getName() + " timezone where timezone.serverTimezone=false"; @@ -44,7 +46,7 @@ + " timezone where timezone.serverTimezone=true"; public List getDefaultTimezones() { - List timezones = this.getHibernateTemplate().find(FIND_DEFAULT_TIMEZONES); + List timezones = this.doFind(FIND_DEFAULT_TIMEZONES); return timezones; } @@ -57,7 +59,7 @@ } public Timezone getServerTimezone() { - List list = getHibernateTemplate().find(FIND_SERVER_TIMEZONE); + List list = doFind(FIND_SERVER_TIMEZONE); if (list.size() > 0) { return (Timezone) list.get(0); } else { Index: lams_common/src/java/org/lamsfoundation/lams/timezone/service/TimezoneService.java =================================================================== diff -u -r009fbce36f45d0929f8007c4bbc798242f57d3af -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/timezone/service/TimezoneService.java (.../TimezoneService.java) (revision 009fbce36f45d0929f8007c4bbc798242f57d3af) +++ lams_common/src/java/org/lamsfoundation/lams/timezone/service/TimezoneService.java (.../TimezoneService.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -30,7 +30,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.timezone.Timezone; -import org.lamsfoundation.lams.timezone.dao.hibernate.TimezoneDAO; +import org.lamsfoundation.lams.timezone.dao.ITimezoneDAO; /** * Class implements ITimezoneService. @@ -43,7 +43,7 @@ protected Logger log = Logger.getLogger(TimezoneService.class); /** Required DAO's */ - protected TimezoneDAO timezoneDAO; + protected ITimezoneDAO timezoneDAO; public List getDefaultTimezones() { return timezoneDAO.getDefaultTimezones(); @@ -86,15 +86,15 @@ /** * @return Returns the timezoneDAO. */ - public TimezoneDAO getTimezoneDAO() { + public ITimezoneDAO getTimezoneDAO() { return timezoneDAO; } /** * * @param timezoneDAO * The timezoneDAO to set. */ - public void setTimezoneDAO(TimezoneDAO timezoneDAO) { + public void setTimezoneDAO(ITimezoneDAO timezoneDAO) { this.timezoneDAO = timezoneDAO; } Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/SystemToolDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/SystemToolDAO.java (.../SystemToolDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/SystemToolDAO.java (.../SystemToolDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -24,33 +24,24 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.dao.hibernate; -import org.hibernate.HibernateException; -import org.hibernate.Session; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.SystemTool; import org.lamsfoundation.lams.tool.dao.ISystemToolDAO; -import org.springframework.orm.hibernate4.HibernateCallback; +import org.springframework.stereotype.Repository; -public class SystemToolDAO extends BaseDAO implements ISystemToolDAO { +@Repository +public class SystemToolDAO extends LAMSBaseDAO implements ISystemToolDAO { private static final String LOAD_TOOL_BY_ACT_TYPE = "from tool in class SystemTool where tool.activityTypeId=:activityTypeId"; public SystemTool getSystemToolByID(final Long systemToolID) { - return (SystemTool)getHibernateTemplate().get(SystemTool.class,systemToolID); + return (SystemTool)getSession().get(SystemTool.class,systemToolID); } public SystemTool getSystemToolByActivityTypeId(final Integer activityTypeId) { - return (SystemTool) getHibernateTemplate().execute(new HibernateCallback() - { - public Object doInHibernate(Session session) throws HibernateException - { - return session.createQuery(LOAD_TOOL_BY_ACT_TYPE) - .setInteger("activityTypeId",activityTypeId) - .uniqueResult(); - } - }); + return (SystemTool) getSession().createQuery(LOAD_TOOL_BY_ACT_TYPE).setInteger("activityTypeId", activityTypeId).uniqueResult(); } } Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolContentDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolContentDAO.java (.../ToolContentDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolContentDAO.java (.../ToolContentDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -23,17 +23,19 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.dao.hibernate; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.ToolContent; import org.lamsfoundation.lams.tool.dao.IToolContentDAO; +import org.springframework.stereotype.Repository; /** * * @author Jacky Fang 8/02/2005 * */ -public class ToolContentDAO extends BaseDAO implements IToolContentDAO +@Repository +public class ToolContentDAO extends LAMSBaseDAO implements IToolContentDAO { /** @@ -49,7 +51,7 @@ */ public void saveToolContent(ToolContent toolContent) { - getHibernateTemplate().save(toolContent); + getSession().save(toolContent); } } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -27,18 +27,20 @@ import org.hibernate.HibernateException; import org.hibernate.Session; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.usermanagement.OrganisationState; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO; import org.springframework.orm.hibernate4.HibernateCallback; import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.stereotype.Repository; /** * @author jliew * */ -public class OrganisationDAO extends BaseDAO implements IOrganisationDAO { +@Repository +public class OrganisationDAO extends LAMSBaseDAO implements IOrganisationDAO { private static final String GET_ALL_ACTIVE_COURSE_IDS = "select o.organisationId from Organisation o" + " where o.organisationType.organisationTypeId = " + OrganisationType.COURSE_TYPE Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java (.../RoleDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java (.../RoleDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -23,21 +23,19 @@ /* $$Id$$ */ package org.lamsfoundation.lams.usermanagement.dao.hibernate; -import org.hibernate.HibernateException; import org.hibernate.Query; -import org.hibernate.Session; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; import org.lamsfoundation.lams.usermanagement.dao.IRoleDAO; -import org.springframework.orm.hibernate4.HibernateCallback; -import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.stereotype.Repository; /** * Hibernate implementation of IRoleDAO * @author chris */ -public class RoleDAO extends BaseDAO implements IRoleDAO +@Repository +public class RoleDAO extends LAMSBaseDAO implements IRoleDAO { private final static String LOAD_USER_BY_ORG_AND_ROLE = "select u " @@ -59,54 +57,26 @@ public User getUserByOrganisationAndRole(final Integer userId, final Integer roleId, final Organisation organisation) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - - return (User)hibernateTemplate.execute( - new HibernateCallback() - { - public Object doInHibernate(Session session) throws HibernateException - { - return session.createQuery(LOAD_USER_BY_ORG_AND_ROLE) - .setInteger("userId",userId) - .setEntity("org", organisation) - .setInteger("roleId",roleId) - .uniqueResult(); - } - } - ); + return (User) getSession().createQuery(LOAD_USER_BY_ORG_AND_ROLE).setInteger("userId", userId) + .setEntity("org", organisation).setInteger("roleId", roleId).uniqueResult(); } public Integer getCountRoleForSystem(final Integer roleId) { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - return (Integer) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) - throws HibernateException { - Query query = session.createQuery(COUNT_ROLE); - query.setInteger("roleId", roleId.intValue()); - Object value = query.uniqueResult(); - return new Integer (((Number)value).intValue()); - } - }); - + Query query = getSession().createQuery(COUNT_ROLE); + query.setInteger("roleId", roleId.intValue()); + Object value = query.uniqueResult(); + return new Integer(((Number) value).intValue()); } - public Integer getCountRoleForOrg(final Integer roleId, final Integer orgId) - { - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - - return (Integer) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) - throws HibernateException { - Query query = session.createQuery(COUNT_ROLE_FOR_ORG); - query.setInteger("roleId", roleId.intValue()); - query.setInteger("orgId", orgId.intValue()); - Object value = query.uniqueResult(); - return new Integer (((Number)value).intValue()); - } - }); - } + public Integer getCountRoleForOrg(final Integer roleId, final Integer orgId) { + Query query = getSession().createQuery(COUNT_ROLE_FOR_ORG); + query.setInteger("roleId", roleId.intValue()); + query.setInteger("orgId", orgId.intValue()); + Object value = query.uniqueResult(); + return new Integer(((Number) value).intValue()); + } } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java (.../UserOrganisationDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java (.../UserOrganisationDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -25,19 +25,17 @@ import java.util.List; -import org.hibernate.HibernateException; import org.hibernate.Query; -import org.hibernate.Session; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationDAO; -import org.springframework.orm.hibernate4.HibernateCallback; -import org.springframework.orm.hibernate4.HibernateTemplate; +import org.springframework.stereotype.Repository; /** * @author jliew * */ -public class UserOrganisationDAO extends BaseDAO implements IUserOrganisationDAO { +@Repository +public class UserOrganisationDAO extends LAMSBaseDAO implements IUserOrganisationDAO { /* * Uses named query to retrieve list of userOrganisations to delete. Used by @@ -51,19 +49,10 @@ * userOrganisationsNotById(java.lang.Integer, java.lang.Integer) */ public List userOrganisationsNotById(final Integer userId, final Integer orgId) { - - List userOrganisations; - HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory()); - userOrganisations = (List) hibernateTemplate.execute(new HibernateCallback() { - public Object doInHibernate(Session session) throws HibernateException { - Query query = session.getNamedQuery("userOrganisationsNotById"); + Query query = getSession().getNamedQuery("userOrganisationsNotById"); query.setInteger("userId", userId.intValue()); query.setInteger("orgId", orgId.intValue()); List result = query.list(); return result; - } - }); - - return userOrganisations; } } Index: lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java =================================================================== diff -u -re0b070e11b6c51b15b0f39906c8e3536f8ac09f0 -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java (.../Configuration.java) (revision e0b070e11b6c51b15b0f39906c8e3536f8ac09f0) +++ lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java (.../Configuration.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -36,8 +36,8 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.config.ConfigurationItem; import org.lamsfoundation.lams.config.Registration; -import org.lamsfoundation.lams.config.dao.hibernate.ConfigurationDAO; -import org.lamsfoundation.lams.config.dao.hibernate.RegistrationDAO; +import org.lamsfoundation.lams.config.dao.IConfigurationDAO; +import org.lamsfoundation.lams.config.dao.IRegistrationDAO; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; import org.quartz.JobDetail; import org.quartz.Scheduler; @@ -63,8 +63,8 @@ private static Map items = null; - protected static ConfigurationDAO configurationDAO; - protected static RegistrationDAO registrationDAO; + protected static IConfigurationDAO configurationDAO; + protected static IRegistrationDAO registrationDAO; protected static MessageService messageService; protected static Scheduler scheduler; @@ -279,7 +279,7 @@ return Configuration.messageService; } - public RegistrationDAO getRegistrationDAO() { + public IRegistrationDAO getRegistrationDAO() { return Configuration.registrationDAO; } @@ -290,22 +290,22 @@ Configuration.setSystemProperty(ConfigurationKeys.TRUSTSTORE_PASSWORD, Configuration.get(ConfigurationKeys.TRUSTSTORE_PASSWORD)); updatePublicFolderName(); - Configuration.configurationDAO.insertOrUpdateAll(Configuration.items.values()); + configurationDAO.insertOrUpdateAll(Configuration.items.values()); } /** * @param configurationDAO * The configurationDAO to set. */ - public void setConfigurationDAO(ConfigurationDAO configurationDAO) { + public void setConfigurationDAO(IConfigurationDAO configurationDAO) { Configuration.configurationDAO = configurationDAO; } public void setMessageService(MessageService messageService) { Configuration.messageService = messageService; } - public void setRegistrationDAO(RegistrationDAO registrationDAO) { + public void setRegistrationDAO(IRegistrationDAO registrationDAO) { Configuration.registrationDAO = registrationDAO; } @@ -322,7 +322,7 @@ private void updatePublicFolderName() { // LDEV-2430 update public folder name according to default server locale WorkspaceFolder publicFolder = null; - List list = Configuration.configurationDAO.findByProperty(WorkspaceFolder.class, + List list = configurationDAO.findByProperty(WorkspaceFolder.class, "workspaceFolderType", WorkspaceFolder.PUBLIC_SEQUENCES); if ((list != null) && (list.size() > 0)) { @@ -331,7 +331,7 @@ Locale locale = new Locale(langCountry[0], langCountry[1]); publicFolder.setName(Configuration.messageService.getMessageSource().getMessage("public.folder.name", null, locale)); - Configuration.configurationDAO.update(publicFolder); + configurationDAO.update(publicFolder); } } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -rb6ed1309cf89ecede6717145c629d7cb3b842582 --- lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java (.../WorkspaceFolderContentDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java (.../WorkspaceFolderContentDAO.java) (revision b6ed1309cf89ecede6717145c629d7cb3b842582) @@ -26,14 +26,16 @@ import java.util.Iterator; import java.util.List; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.workspace.WorkspaceFolderContent; import org.lamsfoundation.lams.workspace.dao.IWorkspaceFolderContentDAO; +import org.springframework.stereotype.Repository; /** * @author Manpreet Minhas */ -public class WorkspaceFolderContentDAO extends BaseDAO implements IWorkspaceFolderContentDAO { +@Repository +public class WorkspaceFolderContentDAO extends LAMSBaseDAO implements IWorkspaceFolderContentDAO { private static final String TABLENAME ="lams_workspace_folder_content";