Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapConfigItemDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -reb760a819980e1fe2877b5a9215a06007fb29e58 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapConfigItemDAO.java (.../GmapConfigItemDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapConfigItemDAO.java (.../GmapConfigItemDAO.java) (revision eb760a819980e1fe2877b5a9215a06007fb29e58) @@ -1,32 +1,23 @@ package org.lamsfoundation.lams.tool.gmap.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.gmap.dao.IGmapConfigItemDAO; import org.lamsfoundation.lams.tool.gmap.model.GmapConfigItem; -import org.springframework.orm.hibernate4.HibernateCallback; -public class GmapConfigItemDAO extends BaseDAO implements IGmapConfigItemDAO +import org.springframework.stereotype.Repository; + +@Repository +public class GmapConfigItemDAO extends LAMSBaseDAO implements IGmapConfigItemDAO { private static final String LOAD_CONFIG_ITEM_BY_KEY = "from GmapConfigItem configuration" + " where configuration.configKey=:key"; public GmapConfigItem getConfigItemByKey(final String configKey) { - return (GmapConfigItem) getHibernateTemplate().execute(new HibernateCallback() - { - public Object doInHibernate(Session session) throws HibernateException - { - return session.createQuery(LOAD_CONFIG_ITEM_BY_KEY) - .setString("key",configKey) - .uniqueResult(); - } - }); - + return (GmapConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey).uniqueResult(); } public void saveOrUpdate(GmapConfigItem mdlForumConfigItem) { - this.getHibernateTemplate().saveOrUpdate(mdlForumConfigItem); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(mdlForumConfigItem); + getSession().flush(); } } Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java =================================================================== diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -reb760a819980e1fe2877b5a9215a06007fb29e58 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java (.../GmapDAO.java) (revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java (.../GmapDAO.java) (revision eb760a819980e1fe2877b5a9215a06007fb29e58) @@ -25,22 +25,22 @@ package org.lamsfoundation.lams.tool.gmap.dao.hibernate; import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; -import org.hibernate.FlushMode; -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.hibernate4.HibernateTemplate; +import org.springframework.stereotype.Repository; /** * DAO for accessing the Gmap objects - Hibernate specific code. */ -public class GmapDAO extends BaseDAO implements IGmapDAO { +@Repository +public class GmapDAO extends LAMSBaseDAO implements IGmapDAO { private static final String FIND_FORUM_BY_CONTENTID = "from Gmap gmap where gmap.toolContentId=?"; public Gmap getByContentId(Long toolContentId) { - List list = getHibernateTemplate().find(FIND_FORUM_BY_CONTENTID, + List list = doFind(FIND_FORUM_BY_CONTENTID, toolContentId); if (list != null && list.size() > 0) return (Gmap) list.get(0); @@ -49,7 +49,7 @@ } public void saveOrUpdate(Gmap gmap) { - this.getHibernateTemplate().saveOrUpdate(gmap); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(gmap); + getSession().flush(); } } Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java =================================================================== diff -u -r71dee7d765407942d4d1d88cba29319277e40b20 -reb760a819980e1fe2877b5a9215a06007fb29e58 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java (.../GmapMarkerDAO.java) (revision 71dee7d765407942d4d1d88cba29319277e40b20) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java (.../GmapMarkerDAO.java) (revision eb760a819980e1fe2877b5a9215a06007fb29e58) @@ -25,26 +25,26 @@ package org.lamsfoundation.lams.tool.gmap.dao.hibernate; import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.gmap.dao.IGmapMarkerDAO; -import org.lamsfoundation.lams.tool.gmap.model.Gmap; import org.lamsfoundation.lams.tool.gmap.model.GmapMarker; -import org.lamsfoundation.lams.tool.gmap.model.GmapSession; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; +import org.springframework.stereotype.Repository; -public class GmapMarkerDAO extends BaseDAO implements IGmapMarkerDAO +@Repository +public class GmapMarkerDAO extends LAMSBaseDAO implements IGmapMarkerDAO { private static final String SQL_QUERY_BY_SESSION = "from " + GmapMarker.class.getName() + " gm " + " where gm.gmapSession.sessionId=?"; public void saveOrUpdate(GmapMarker gmapMarker) { - this.getHibernateTemplate().saveOrUpdate(gmapMarker); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(gmapMarker); + getSession().flush(); } public List getByToolSessionId(Long toolSessionId) { - return (List)(this.getHibernateTemplate().find(SQL_QUERY_BY_SESSION, toolSessionId)); + return (List)(doFind(SQL_QUERY_BY_SESSION, toolSessionId)); } } Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java =================================================================== diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -reb760a819980e1fe2877b5a9215a06007fb29e58 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java (.../GmapSessionDAO.java) (revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java (.../GmapSessionDAO.java) (revision eb760a819980e1fe2877b5a9215a06007fb29e58) @@ -25,26 +25,28 @@ package org.lamsfoundation.lams.tool.gmap.dao.hibernate; import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.gmap.dao.IGmapSessionDAO; import org.lamsfoundation.lams.tool.gmap.model.GmapSession; +import org.springframework.stereotype.Repository; /** * DAO for accessing the GmapSession objects - Hibernate specific code. */ -public class GmapSessionDAO extends BaseDAO implements IGmapSessionDAO { +@Repository +public class GmapSessionDAO extends LAMSBaseDAO implements IGmapSessionDAO { public static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + GmapSession.class.getName() + " where session_id=?"; public void saveOrUpdate(GmapSession session) { - this.getHibernateTemplate().saveOrUpdate(session); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(session); + getSession().flush(); } public GmapSession getBySessionId(Long toolSessionId) { - List list = this.getHibernateTemplate().find( + List list = doFind( SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId); if (list == null || list.isEmpty()) return null; @@ -54,8 +56,8 @@ public void deleteBySessionID(Long toolSessionID) { GmapSession session = getBySessionId(toolSessionID); if(session != null){ - this.getHibernateTemplate().delete(session); - this.getHibernateTemplate().flush(); + getSession().delete(session); + getSession().flush(); } } } Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java =================================================================== diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -reb760a819980e1fe2877b5a9215a06007fb29e58 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java (.../GmapUserDAO.java) (revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java (.../GmapUserDAO.java) (revision eb760a819980e1fe2877b5a9215a06007fb29e58) @@ -25,15 +25,17 @@ package org.lamsfoundation.lams.tool.gmap.dao.hibernate; import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; -import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.gmap.dao.IGmapUserDAO; import org.lamsfoundation.lams.tool.gmap.model.GmapUser; +import org.springframework.stereotype.Repository; /** * DAO for accessing the GmapUser objects - Hibernate specific code. */ -public class GmapUserDAO extends BaseDAO implements IGmapUserDAO { +@Repository +public class GmapUserDAO extends LAMSBaseDAO implements IGmapUserDAO { public static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from " + GmapUser.class.getName() + " as f" @@ -47,7 +49,7 @@ + GmapUser.class.getName() + " where uid=?"; public GmapUser getByUserIdAndSessionId(Long userId, Long toolSessionId) { - List list = this.getHibernateTemplate().find( + List list = doFind( SQL_QUERY_FIND_BY_USER_ID_SESSION_ID, new Object[] { userId, toolSessionId }); @@ -60,7 +62,7 @@ public GmapUser getByLoginNameAndSessionId(String loginName, Long toolSessionId) { - List list = this.getHibernateTemplate().find( + List list = doFind( SQL_QUERY_FIND_BY_LOGIN_NAME_SESSION_ID, new Object[] { loginName, toolSessionId }); @@ -72,12 +74,12 @@ } public void saveOrUpdate(GmapUser gmapUser) { - this.getHibernateTemplate().saveOrUpdate(gmapUser); - this.getHibernateTemplate().flush(); + getSession().saveOrUpdate(gmapUser); + getSession().flush(); } public GmapUser getByUID(Long uid) { - List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_UID, + List list = doFind(SQL_QUERY_FIND_BY_UID, new Object[] { uid }); if (list == null || list.isEmpty())