Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaCommentDAO.java
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r69270cb0d662d3cec3f2170c70fdb574d231a2fe
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaCommentDAO.java	(.../KalturaCommentDAO.java)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaCommentDAO.java	(.../KalturaCommentDAO.java)	(revision 69270cb0d662d3cec3f2170c70fdb574d231a2fe)
@@ -25,22 +25,24 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaCommentDAO;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaComment;
+import org.springframework.stereotype.Repository;
 
 /**
  * Hibernate implementation of <code>IKalturaCommentDAO</code>.
  * 
  * @author Andrey Balan
  * @see org.lamsfoundation.lams.tool.kaltura.dao.IKalturaCommentDAO
  */
-public class KalturaCommentDAO extends BaseDAO implements IKalturaCommentDAO {
+@Repository
+public class KalturaCommentDAO extends LAMSBaseDAO implements IKalturaCommentDAO {
 
     private static final String FIND_BY_UID = "from " + KalturaComment.class.getName() + " as r where r.uid = ?";
 
     public KalturaComment getCommentByUid(Long commentUid) {
-	List list = getHibernateTemplate().find(FIND_BY_UID, commentUid);
+	List list = doFind(FIND_BY_UID, commentUid);
 	if (list == null || list.size() == 0)
 	    return null;
 	return (KalturaComment) list.get(0);
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaDAO.java
===================================================================
diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r69270cb0d662d3cec3f2170c70fdb574d231a2fe
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaDAO.java	(.../KalturaDAO.java)	(revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaDAO.java	(.../KalturaDAO.java)	(revision 69270cb0d662d3cec3f2170c70fdb574d231a2fe)
@@ -26,30 +26,32 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaDAO;
 import org.lamsfoundation.lams.tool.kaltura.model.Kaltura;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the Kaltura objects - Hibernate specific code.
  */
-public class KalturaDAO extends BaseDAO implements IKalturaDAO {
+@Repository
+public class KalturaDAO extends LAMSBaseDAO implements IKalturaDAO {
 
     private static final String FIND_FORUM_BY_CONTENTID = "from Kaltura kaltura where kaltura.toolContentId=?";
 
     public Kaltura getByContentId(Long toolContentId) {
-	List list = getHibernateTemplate().find(KalturaDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
+	List list = doFind(KalturaDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
 	if (list != null && list.size() > 0) {
 	    return (Kaltura) list.get(0);
 	} else {
 	    return null;
 	}
     }
 
-    public void saveOrUpdate(Kaltura kaltura) {
-	this.getHibernateTemplate().saveOrUpdate(kaltura);
-	this.getHibernateTemplate().flush();
-    }
+	public void saveOrUpdate(Kaltura kaltura) {
+		getSession().saveOrUpdate(kaltura);
+		getSession().flush();
+	}
 
     public void releaseFromCache(Object o) {
 	getSessionFactory().getCurrentSession().evict(o);
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaItemDAO.java
===================================================================
diff -u -rb52f787a7b8d6dc77ef090dc023fc64fa3a9b2f2 -r69270cb0d662d3cec3f2170c70fdb574d231a2fe
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaItemDAO.java	(.../KalturaItemDAO.java)	(revision b52f787a7b8d6dc77ef090dc023fc64fa3a9b2f2)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaItemDAO.java	(.../KalturaItemDAO.java)	(revision 69270cb0d662d3cec3f2170c70fdb574d231a2fe)
@@ -25,34 +25,35 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaItemDAO;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaItem;
-import org.lamsfoundation.lams.tool.kaltura.model.KalturaItemVisitLog;
+import org.springframework.stereotype.Repository;
 
-public class KalturaItemDAO extends BaseDAO implements IKalturaItemDAO {
+@Repository
+public class KalturaItemDAO extends LAMSBaseDAO implements IKalturaItemDAO {
 
     private static final String FIND_AUTHORING_ITEMS = "from " + KalturaItem.class.getName()
 	    + " where kaltura_uid = ? and create_by_author = 1 order by create_date asc";
     
     private static final String FIND_ITEMS_COUNT_BY_USER = "select count(*) from "
 	    + KalturaItem.class.getName() + " as r where  r.createdBy.session.sessionId=? and  r.createdBy.userId =?";
 
-    @Override
-    public List getAuthoringItems(Long kalturaUid) {
-	return this.getHibernateTemplate().find(FIND_AUTHORING_ITEMS, kalturaUid);
-    }
+	@Override
+	public List getAuthoringItems(Long kalturaUid) {
+		return this.doFind(FIND_AUTHORING_ITEMS, kalturaUid);
+	}
 
-    @Override
-    public KalturaItem getByUid(Long kalturaItemUid) {
-	return (KalturaItem) this.getHibernateTemplate().get(KalturaItem.class, kalturaItemUid);
-    }
-    
-    @Override
-    public int getItemsCountByUser(Long toolSessionId, Long userId) {
-	List list = getHibernateTemplate().find(FIND_ITEMS_COUNT_BY_USER, new Object[] { toolSessionId, userId });
-	if (list == null || list.size() == 0)
-	    return 0;
-	return ((Number) list.get(0)).intValue();
-    }
+	@Override
+	public KalturaItem getByUid(Long kalturaItemUid) {
+		return (KalturaItem) getSession().get(KalturaItem.class, kalturaItemUid);
+	}
+
+	@Override
+	public int getItemsCountByUser(Long toolSessionId, Long userId) {
+		List list = doFind(FIND_ITEMS_COUNT_BY_USER, new Object[] { toolSessionId, userId });
+		if (list == null || list.size() == 0)
+			return 0;
+		return ((Number) list.get(0)).intValue();
+	}
 }
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaItemVisitDAO.java
===================================================================
diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -r69270cb0d662d3cec3f2170c70fdb574d231a2fe
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaItemVisitDAO.java	(.../KalturaItemVisitDAO.java)	(revision 2aaccb954583cd8431759dca8e912a8fe863aa0e)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaItemVisitDAO.java	(.../KalturaItemVisitDAO.java)	(revision 69270cb0d662d3cec3f2170c70fdb574d231a2fe)
@@ -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.tool.kaltura.dao.IKalturaItemVisitDAO;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaItemVisitLog;
+import org.springframework.stereotype.Repository;
 
 /**
  * Hibernate implementation of <code>IKalturaItemVisitDAO</code>.
  * 
  * @author Andrey Balan
  * @see org.lamsfoundation.lams.tool.kaltura.dao.IKalturaItemVisitDAO
  */
-public class KalturaItemVisitDAO extends BaseDAO implements IKalturaItemVisitDAO {
+@Repository
+public class KalturaItemVisitDAO extends LAMSBaseDAO implements IKalturaItemVisitDAO {
 
     private static final String FIND_BY_ITEM_AND_USER = "from " + KalturaItemVisitLog.class.getName()
 	    + " as r where r.user.userId = ? and r.kalturaItem.uid=?";
@@ -47,14 +49,14 @@
 	    + KalturaItemVisitLog.class.getName() + " as r where  r.sessionId=? and  r.user.userId =?";
     
     public KalturaItemVisitLog getKalturaItemLog(Long itemUid, Long userId) {
-	List list = getHibernateTemplate().find(FIND_BY_ITEM_AND_USER, new Object[] { userId, itemUid });
+	List list = doFind(FIND_BY_ITEM_AND_USER, new Object[] { userId, itemUid });
 	if (list == null || list.size() == 0)
 	    return null;
 	return (KalturaItemVisitLog) list.get(0);
     }
 
     public int getUserViewLogCount(Long toolSessionId, Long userId) {
-	List list = getHibernateTemplate().find(FIND_VIEW_COUNT_BY_USER, new Object[] { toolSessionId, userId });
+	List list = doFind(FIND_VIEW_COUNT_BY_USER, new Object[] { toolSessionId, userId });
 	if (list == null || list.size() == 0)
 	    return 0;
 	return ((Number) list.get(0)).intValue();
@@ -63,7 +65,7 @@
     @SuppressWarnings("unchecked")
     public List<KalturaItemVisitLog> getKalturaItemLogBySession(Long sessionId, Long itemUid) {
 
-	return (List<KalturaItemVisitLog>) getHibernateTemplate().find(FIND_BY_ITEM_BYSESSION, new Object[] { sessionId, itemUid });
+	return (List<KalturaItemVisitLog>) doFind(FIND_BY_ITEM_BYSESSION, new Object[] { sessionId, itemUid });
     }
 
 }
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaRatingDAO.java
===================================================================
diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -r69270cb0d662d3cec3f2170c70fdb574d231a2fe
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaRatingDAO.java	(.../KalturaRatingDAO.java)	(revision 2aaccb954583cd8431759dca8e912a8fe863aa0e)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaRatingDAO.java	(.../KalturaRatingDAO.java)	(revision 69270cb0d662d3cec3f2170c70fdb574d231a2fe)
@@ -27,18 +27,20 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaRatingDAO;
 import org.lamsfoundation.lams.tool.kaltura.dto.AverageRatingDTO;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaRating;
+import org.springframework.stereotype.Repository;
 
 /**
  * Hibernate implementation of <code>IKalturaRatingDAO</code>.
  * 
  * @author Andrey Balan
  * @see org.lamsfoundation.lams.tool.kaltura.dao.IKalturaRatingDAO
  */
-public class KalturaRatingDAO extends BaseDAO implements IKalturaRatingDAO {
+@Repository
+public class KalturaRatingDAO extends LAMSBaseDAO implements IKalturaRatingDAO {
 
     private static final String FIND_BY_ITEM_AND_USER = "from " + KalturaRating.class.getName()
 	    + " as r where r.createBy.userId = ? and r.kalturaItem.uid=?";
@@ -51,7 +53,7 @@
 
     @Override
     public KalturaRating getKalturaRatingByItemAndUser(Long itemUid, Long userId) {
-	List list = getHibernateTemplate().find(FIND_BY_ITEM_AND_USER, new Object[] { userId, itemUid });
+	List list = doFind(FIND_BY_ITEM_AND_USER, new Object[] { userId, itemUid });
 	if (list == null || list.size() == 0)
 	    return null;
 	return (KalturaRating) list.get(0);
@@ -60,13 +62,13 @@
     @SuppressWarnings("unchecked")
     @Override
     public List<KalturaRating> getKalturaRatingsByItemUid(Long itemUid) {
-	return (List<KalturaRating>) getHibernateTemplate().find(FIND_BY_ITEM_UID, itemUid);
+	return (List<KalturaRating>) doFind(FIND_BY_ITEM_UID, itemUid);
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public AverageRatingDTO getAverageRatingDtoByItem(Long itemUid, Long sessionId) {
-	List<Object[]> list = (List<Object[]>) getHibernateTemplate().find(FIND_AVERAGE_RATING_BY_MESSAGE, new Object[] { itemUid, sessionId });
+	List<Object[]> list = (List<Object[]>) doFind(FIND_AVERAGE_RATING_BY_MESSAGE, new Object[] { itemUid, sessionId });
 	Object[] results = list.get(0);
 
 	Object averageRatingObj = (results[0] == null) ? 0 : results[0];
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaSessionDAO.java
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r69270cb0d662d3cec3f2170c70fdb574d231a2fe
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaSessionDAO.java	(.../KalturaSessionDAO.java)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaSessionDAO.java	(.../KalturaSessionDAO.java)	(revision 69270cb0d662d3cec3f2170c70fdb574d231a2fe)
@@ -26,35 +26,37 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaSessionDAO;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaSession;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the KalturaSession objects - Hibernate specific code.
  */
-public class KalturaSessionDAO extends BaseDAO implements IKalturaSessionDAO {
+@Repository
+public class KalturaSessionDAO extends LAMSBaseDAO implements IKalturaSessionDAO {
 
     public static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + KalturaSession.class.getName()
 	    + " where session_id=?";
 
-    public void saveOrUpdate(KalturaSession session) {
-	this.getHibernateTemplate().saveOrUpdate(session);
-	this.getHibernateTemplate().flush();
-    }
+	public void saveOrUpdate(KalturaSession session) {
+		getSession().saveOrUpdate(session);
+		getSession().flush();
+	}
 
-    public KalturaSession getBySessionId(Long toolSessionId) {
-	List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId);
-	if (list == null || list.isEmpty())
-	    return null;
-	return (KalturaSession) list.get(0);
-    }
+	public KalturaSession getBySessionId(Long toolSessionId) {
+		List list = this.doFind(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId);
+		if (list == null || list.isEmpty())
+			return null;
+		return (KalturaSession) list.get(0);
+	}
 
-    public void deleteBySessionID(Long toolSessionID) {
-	KalturaSession session = getBySessionId(toolSessionID);
-	if (session != null) {
-	    this.getHibernateTemplate().delete(session);
-	    this.getHibernateTemplate().flush();
+	public void deleteBySessionID(Long toolSessionID) {
+		KalturaSession session = getBySessionId(toolSessionID);
+		if (session != null) {
+			getSession().delete(session);
+			getSession().flush();
+		}
 	}
-    }
 }
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaUserDAO.java
===================================================================
diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r69270cb0d662d3cec3f2170c70fdb574d231a2fe
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaUserDAO.java	(.../KalturaUserDAO.java)	(revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaUserDAO.java	(.../KalturaUserDAO.java)	(revision 69270cb0d662d3cec3f2170c70fdb574d231a2fe)
@@ -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.kaltura.dao.IKalturaUserDAO;
 import org.lamsfoundation.lams.tool.kaltura.model.KalturaUser;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the KalturaUser objects - Hibernate specific code.
  */
-public class KalturaUserDAO extends BaseDAO implements IKalturaUserDAO {
+@Repository
+public class KalturaUserDAO extends LAMSBaseDAO implements IKalturaUserDAO {
 
     public static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from " + KalturaUser.class.getName() + " as f"
 	    + " where user_id=? and f.session.sessionId=?";
@@ -48,7 +50,7 @@
 
     @Override
     public KalturaUser getByUserIdAndSessionId(Long userId, Long toolSessionId) {
-	List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_USER_ID_SESSION_ID,
+	List list = this.doFind(SQL_QUERY_FIND_BY_USER_ID_SESSION_ID,
 		new Object[] { userId, toolSessionId });
 
 	if (list == null || list.isEmpty())
@@ -60,7 +62,7 @@
     @Override
     public KalturaUser getByLoginNameAndSessionId(String loginName, Long toolSessionId) {
 
-	List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_LOGIN_NAME_SESSION_ID,
+	List list = this.doFind(SQL_QUERY_FIND_BY_LOGIN_NAME_SESSION_ID,
 		new Object[] { loginName, toolSessionId });
 
 	if (list == null || list.isEmpty())
@@ -72,21 +74,21 @@
     
     @Override
     public KalturaUser getByUserIdAndContentId(Long userId, Long contentId) {
-	List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId });
+	List list = this.doFind(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId });
 	if (list == null || list.size() == 0)
 	    return null;
 	return (KalturaUser) list.get(0);
     }
 
-    @Override
-    public void saveOrUpdate(KalturaUser kalturaUser) {
-	this.getHibernateTemplate().saveOrUpdate(kalturaUser);
-	this.getHibernateTemplate().flush();
-    }
+	@Override
+	public void saveOrUpdate(KalturaUser kalturaUser) {
+		getSession().saveOrUpdate(kalturaUser);
+		getSession().flush();
+	}
 
     @Override
     public KalturaUser getByUid(Long uid) {
-	List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_UID, new Object[] { uid });
+	List list = this.doFind(SQL_QUERY_FIND_BY_UID, new Object[] { uid });
 
 	if (list == null || list.isEmpty())
 	    return null;