Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionDAO.java
===================================================================
diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r2caa3f7dc5555c612cb9da91582fe32d065a4ded
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionDAO.java	(.../LeaderselectionDAO.java)	(revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionDAO.java	(.../LeaderselectionDAO.java)	(revision 2caa3f7dc5555c612cb9da91582fe32d065a4ded)
@@ -26,20 +26,22 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.leaderselection.dao.ILeaderselectionDAO;
 import org.lamsfoundation.lams.tool.leaderselection.model.Leaderselection;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the Leaderselection objects - Hibernate specific code.
  */
-public class LeaderselectionDAO extends BaseDAO implements ILeaderselectionDAO {
+@Repository
+public class LeaderselectionDAO extends LAMSBaseDAO implements ILeaderselectionDAO {
 
     private static final String FIND_FORUM_BY_CONTENTID = "from Leaderselection leaderselection where leaderselection.toolContentId=?";
 
     @Override
     public Leaderselection getByContentId(Long toolContentId) {
-	List list = getHibernateTemplate().find(LeaderselectionDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
+	List list = doFind(LeaderselectionDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
 	if (list != null && list.size() > 0) {
 	    return (Leaderselection) list.get(0);
 	} else {
@@ -49,8 +51,8 @@
 
     @Override
     public void saveOrUpdate(Leaderselection leaderselection) {
-	this.getHibernateTemplate().saveOrUpdate(leaderselection);
-	this.getHibernateTemplate().flush();
+	getSession().saveOrUpdate(leaderselection);
+	getSession().flush();
     }
 
     @Override
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionSessionDAO.java
===================================================================
diff -u -r17ddd3aac11d9fecc83159a9c829e989754accfb -r2caa3f7dc5555c612cb9da91582fe32d065a4ded
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionSessionDAO.java	(.../LeaderselectionSessionDAO.java)	(revision 17ddd3aac11d9fecc83159a9c829e989754accfb)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionSessionDAO.java	(.../LeaderselectionSessionDAO.java)	(revision 2caa3f7dc5555c612cb9da91582fe32d065a4ded)
@@ -26,27 +26,29 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.leaderselection.dao.ILeaderselectionSessionDAO;
 import org.lamsfoundation.lams.tool.leaderselection.model.LeaderselectionSession;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the LeaderselectionSession objects - Hibernate specific code.
  */
-public class LeaderselectionSessionDAO extends BaseDAO implements ILeaderselectionSessionDAO {
+@Repository
+public class LeaderselectionSessionDAO extends LAMSBaseDAO implements ILeaderselectionSessionDAO {
 
     public static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + LeaderselectionSession.class.getName()
 	    + " where session_id=?";
 
     @Override
     public void saveOrUpdate(LeaderselectionSession session) {
-	this.getHibernateTemplate().saveOrUpdate(session);
-	this.getHibernateTemplate().flush();
+	getSession().saveOrUpdate(session);
+	getSession().flush();
     }
 
     @Override
     public LeaderselectionSession getBySessionId(Long toolSessionId) {
-	List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId);
+	List list = doFind(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId);
 	if (list == null || list.isEmpty())
 	    return null;
 	return (LeaderselectionSession) list.get(0);
@@ -56,8 +58,8 @@
     public void deleteBySessionID(Long toolSessionID) {
 	LeaderselectionSession session = getBySessionId(toolSessionID);
 	if (session != null) {
-	    this.getHibernateTemplate().delete(session);
-	    this.getHibernateTemplate().flush();
+	    getSession().delete(session);
+	    getSession().flush();
 	}
     }
 }
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionUserDAO.java
===================================================================
diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -r2caa3f7dc5555c612cb9da91582fe32d065a4ded
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionUserDAO.java	(.../LeaderselectionUserDAO.java)	(revision 2aaccb954583cd8431759dca8e912a8fe863aa0e)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionUserDAO.java	(.../LeaderselectionUserDAO.java)	(revision 2caa3f7dc5555c612cb9da91582fe32d065a4ded)
@@ -26,14 +26,16 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.leaderselection.dao.ILeaderselectionUserDAO;
 import org.lamsfoundation.lams.tool.leaderselection.model.LeaderselectionUser;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the LeaderselectionUser objects - Hibernate specific code.
  */
-public class LeaderselectionUserDAO extends BaseDAO implements ILeaderselectionUserDAO {
+@Repository
+public class LeaderselectionUserDAO extends LAMSBaseDAO implements ILeaderselectionUserDAO {
 
     public static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from " + LeaderselectionUser.class.getName()
 	    + " as f" + " where user_id=? and f.leaderselectionSession.sessionId=?";
@@ -48,7 +50,7 @@
 
     @Override
     public LeaderselectionUser getByUserIdAndSessionId(Long userId, Long toolSessionId) {
-	List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_USER_ID_SESSION_ID,
+	List list = doFind(SQL_QUERY_FIND_BY_USER_ID_SESSION_ID,
 		new Object[] { userId, toolSessionId });
 
 	if (list == null || list.isEmpty())
@@ -59,13 +61,13 @@
 
     @Override
     public void saveOrUpdate(LeaderselectionUser leaderselectionUser) {
-	this.getHibernateTemplate().saveOrUpdate(leaderselectionUser);
-	this.getHibernateTemplate().flush();
+	getSession().saveOrUpdate(leaderselectionUser);
+	getSession().flush();
     }
 
     @Override
     public LeaderselectionUser getByUID(Long uid) {
-	List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_UID, new Object[] { uid });
+	List list = doFind(SQL_QUERY_FIND_BY_UID, new Object[] { uid });
 
 	if (list == null || list.isEmpty())
 	    return null;
@@ -76,6 +78,6 @@
     @SuppressWarnings("unchecked")
     @Override
     public List<LeaderselectionUser> getBySessionId(Long sessionId) {
-	return (List<LeaderselectionUser>) this.getHibernateTemplate().find(FIND_BY_SESSION_ID, sessionId);
+	return (List<LeaderselectionUser>) doFind(FIND_BY_SESSION_ID, sessionId);
     }
 }