Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java
===================================================================
diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r8123f75bb8d8e514f06f8ec5a7b6c7f97b453a3a
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java	(.../NotebookDAO.java)	(revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java	(.../NotebookDAO.java)	(revision 8123f75bb8d8e514f06f8ec5a7b6c7f97b453a3a)
@@ -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.notebook.dao.INotebookDAO;
 import org.lamsfoundation.lams.tool.notebook.model.Notebook;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the Notebook objects - Hibernate specific code.
  */
-public class NotebookDAO extends BaseDAO implements INotebookDAO {
+@Repository
+public class NotebookDAO extends LAMSBaseDAO implements INotebookDAO {
 
     private static final String FIND_FORUM_BY_CONTENTID = "from Notebook notebook where notebook.toolContentId=?";
 
     public Notebook getByContentId(Long toolContentId) {
-	List list = getHibernateTemplate().find(NotebookDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
+	List list = doFind(NotebookDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
 	if (list != null && list.size() > 0) {
 	    return (Notebook) list.get(0);
 	} else {
@@ -47,8 +49,8 @@
     }
 
     public void saveOrUpdate(Notebook notebook) {
-	this.getHibernateTemplate().saveOrUpdate(notebook);
-	this.getHibernateTemplate().flush();
+	getSession().saveOrUpdate(notebook);
+	getSession().flush();
     }
 
     public void releaseFromCache(Object o) {
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookSessionDAO.java
===================================================================
diff -u -r5fd25049d526080b60f6753a3d4603fb18913202 -r8123f75bb8d8e514f06f8ec5a7b6c7f97b453a3a
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookSessionDAO.java	(.../NotebookSessionDAO.java)	(revision 5fd25049d526080b60f6753a3d4603fb18913202)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookSessionDAO.java	(.../NotebookSessionDAO.java)	(revision 8123f75bb8d8e514f06f8ec5a7b6c7f97b453a3a)
@@ -26,26 +26,28 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.notebook.dao.INotebookSessionDAO;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookSession;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the NotebookSession objects - Hibernate specific code.
  */
-public class NotebookSessionDAO extends BaseDAO implements INotebookSessionDAO {
+@Repository
+public class NotebookSessionDAO extends LAMSBaseDAO implements INotebookSessionDAO {
 
     public static final String FIND_BY_SESSION_ID = "from " + NotebookSession.class.getName() + " where session_id=?";
 
     @Override
     public void saveOrUpdate(NotebookSession session) {
-	this.getHibernateTemplate().saveOrUpdate(session);
-	this.getHibernateTemplate().flush();
+	getSession().saveOrUpdate(session);
+	getSession().flush();
     }
 
     @Override
     public NotebookSession getBySessionId(Long toolSessionId) {
-	List list = this.getHibernateTemplate().find(FIND_BY_SESSION_ID, toolSessionId);
+	List list = doFind(FIND_BY_SESSION_ID, toolSessionId);
 	if (list == null || list.isEmpty())
 	    return null;
 	return (NotebookSession) list.get(0);
@@ -55,8 +57,8 @@
     public void deleteBySessionID(Long toolSessionID) {
 	NotebookSession session = getBySessionId(toolSessionID);
 	if (session != null) {
-	    this.getHibernateTemplate().delete(session);
-	    this.getHibernateTemplate().flush();
+	    getSession().delete(session);
+	    getSession().flush();
 	}
     }
 }
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java
===================================================================
diff -u -r9e446244a7245a4e8893e4673a801c56e4a35334 -r8123f75bb8d8e514f06f8ec5a7b6c7f97b453a3a
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java	(.../NotebookUserDAO.java)	(revision 9e446244a7245a4e8893e4673a801c56e4a35334)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java	(.../NotebookUserDAO.java)	(revision 8123f75bb8d8e514f06f8ec5a7b6c7f97b453a3a)
@@ -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.notebook.dao.INotebookUserDAO;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookUser;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the NotebookUser objects - Hibernate specific code.
  */
-public class NotebookUserDAO extends BaseDAO implements INotebookUserDAO {
+@Repository
+public class NotebookUserDAO extends LAMSBaseDAO implements INotebookUserDAO {
 
 	public static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from "
 			+ NotebookUser.class.getName() + " as f"
@@ -47,7 +49,7 @@
 			+ NotebookUser.class.getName() + " where uid=?";
 
 	public NotebookUser 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 NotebookUser 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(NotebookUser notebookUser) {
-		this.getHibernateTemplate().saveOrUpdate(notebookUser);
-		this.getHibernateTemplate().flush();
+		getSession().saveOrUpdate(notebookUser);
+		getSession().flush();
 	}
 
 	public NotebookUser 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())