Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeDAO.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rae0c0507e78be6e32a2796fb67e5342e35c20af8
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeDAO.java	(.../ScribeDAO.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeDAO.java	(.../ScribeDAO.java)	(revision ae0c0507e78be6e32a2796fb67e5342e35c20af8)
@@ -26,19 +26,21 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.scribe.dao.IScribeDAO;
 import org.lamsfoundation.lams.tool.scribe.model.Scribe;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the Scribe objects - Hibernate specific code.
  */
-public class ScribeDAO extends BaseDAO implements IScribeDAO {
+@Repository
+public class ScribeDAO extends LAMSBaseDAO implements IScribeDAO {
 
 	private static final String FIND_FORUM_BY_CONTENTID = "from Scribe scribe where scribe.toolContentId=?";
 
 	public Scribe 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 (Scribe) list.get(0);
@@ -47,7 +49,7 @@
 	}
 
 	public void saveOrUpdate(Scribe scribe) {
-		this.getHibernateTemplate().saveOrUpdate(scribe);
-		this.getHibernateTemplate().flush();
+		getSession().saveOrUpdate(scribe);
+		getSession().flush();
 	}
 }
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeHeadingDAO.java
===================================================================
diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rae0c0507e78be6e32a2796fb67e5342e35c20af8
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeHeadingDAO.java	(.../ScribeHeadingDAO.java)	(revision 2aaccb954583cd8431759dca8e912a8fe863aa0e)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeHeadingDAO.java	(.../ScribeHeadingDAO.java)	(revision ae0c0507e78be6e32a2796fb67e5342e35c20af8)
@@ -26,21 +26,23 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.scribe.dao.IScribeHeadingDAO;
 import org.lamsfoundation.lams.tool.scribe.model.ScribeReportEntry;
+import org.springframework.stereotype.Repository;
 
-public class ScribeHeadingDAO extends BaseDAO implements IScribeHeadingDAO {
+@Repository
+public class ScribeHeadingDAO extends LAMSBaseDAO implements IScribeHeadingDAO {
 
 	private static final String SQL_DELETE_REPORT="from " + ScribeReportEntry.class.getName() + " as r where r.scribeHeading.uid=?"; 
 	@SuppressWarnings("unchecked")
 	public boolean deleteReport(Long headingUid) {
-		List<ScribeReportEntry> reports = (List<ScribeReportEntry>) this.getHibernateTemplate().find(SQL_DELETE_REPORT,new Object[]{headingUid});
+		List<ScribeReportEntry> reports = (List<ScribeReportEntry>) doFind(SQL_DELETE_REPORT,new Object[]{headingUid});
 		if(reports.isEmpty())
 			return false;
 		
 		for (ScribeReportEntry report: reports) {
-			getHibernateTemplate().delete(report);
+			getSession().delete(report);
 		}
 		
 		return true;
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeSessionDAO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rae0c0507e78be6e32a2796fb67e5342e35c20af8
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeSessionDAO.java	(.../ScribeSessionDAO.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeSessionDAO.java	(.../ScribeSessionDAO.java)	(revision ae0c0507e78be6e32a2796fb67e5342e35c20af8)
@@ -26,25 +26,27 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.scribe.dao.IScribeSessionDAO;
 import org.lamsfoundation.lams.tool.scribe.model.ScribeSession;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the ScribeSession objects - Hibernate specific code.
  */
-public class ScribeSessionDAO extends BaseDAO implements IScribeSessionDAO {
+@Repository
+public class ScribeSessionDAO extends LAMSBaseDAO implements IScribeSessionDAO {
 
 	public static final String SQL_QUERY_FIND_BY_SESSION_ID = "from "
 			+ ScribeSession.class.getName() + " where session_id=?";
 
 	public void saveOrUpdate(ScribeSession session) {
-		this.getHibernateTemplate().saveOrUpdate(session);
-		this.getHibernateTemplate().flush();
+		getSession().saveOrUpdate(session);
+		getSession().flush();
 	}
 
 	public ScribeSession 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) {
 		ScribeSession session = getBySessionId(toolSessionID);
 		if(session != null){
-			this.getHibernateTemplate().delete(session);
-			this.getHibernateTemplate().flush();
+			getSession().delete(session);
+			getSession().flush();
 		}
 	}
 }
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeUserDAO.java
===================================================================
diff -u -r9e446244a7245a4e8893e4673a801c56e4a35334 -rae0c0507e78be6e32a2796fb67e5342e35c20af8
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeUserDAO.java	(.../ScribeUserDAO.java)	(revision 9e446244a7245a4e8893e4673a801c56e4a35334)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeUserDAO.java	(.../ScribeUserDAO.java)	(revision ae0c0507e78be6e32a2796fb67e5342e35c20af8)
@@ -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.scribe.dao.IScribeUserDAO;
 import org.lamsfoundation.lams.tool.scribe.model.ScribeUser;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the ScribeUser objects - Hibernate specific code.
  */
-public class ScribeUserDAO extends BaseDAO implements IScribeUserDAO {
+@Repository
+public class ScribeUserDAO extends LAMSBaseDAO implements IScribeUserDAO {
 
 	public static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from "
 			+ ScribeUser.class.getName() + " as f"
@@ -47,7 +49,7 @@
 			+ ScribeUser.class.getName() + " where uid=?";
 
 	public ScribeUser 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 ScribeUser 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(ScribeUser scribeUser) {
-		this.getHibernateTemplate().saveOrUpdate(scribeUser);
-		this.getHibernateTemplate().flush();
+		getSession().saveOrUpdate(scribeUser);
+		getSession().flush();
 	}
 
 	public ScribeUser 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())