Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java
===================================================================
diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r49aa132c7b0c31284066f73bf3d823b2f169b2ca
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java	(.../WikiDAO.java)	(revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiDAO.java	(.../WikiDAO.java)	(revision 49aa132c7b0c31284066f73bf3d823b2f169b2ca)
@@ -29,22 +29,22 @@
 import java.util.List;
 import java.util.Set;
 
-import org.hibernate.FlushMode;
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.wiki.dao.IWikiDAO;
 import org.lamsfoundation.lams.tool.wiki.model.Wiki;
 import org.lamsfoundation.lams.tool.wiki.model.WikiPage;
-import org.springframework.orm.hibernate4.HibernateTemplate;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the Wiki objects - Hibernate specific code.
  */
-public class WikiDAO extends BaseDAO implements IWikiDAO {
+@Repository
+public class WikiDAO extends LAMSBaseDAO implements IWikiDAO {
 
     private static final String FIND_FORUM_BY_CONTENTID = "from Wiki wiki where wiki.toolContentId=?";
 
   public Wiki getByContentId(Long toolContentId) {
-	List list = getHibernateTemplate().find(FIND_FORUM_BY_CONTENTID, toolContentId);
+	List list = doFind(FIND_FORUM_BY_CONTENTID, toolContentId);
 	if (list != null && list.size() > 0) {
 	    Wiki wiki = (Wiki) list.get(0);
 	    removeDuplicatePages(wiki);
@@ -58,7 +58,7 @@
     public void saveOrUpdate(Wiki wiki) {
 	// Removing duplicate pages 
 	removeDuplicatePages(wiki);
-	this.getHibernateTemplate().saveOrUpdate(wiki);
+	getSession().saveOrUpdate(wiki);
 	//this.getHibernateTemplate().flush();
     }
 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageContentDAO.java
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r49aa132c7b0c31284066f73bf3d823b2f169b2ca
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageContentDAO.java	(.../WikiPageContentDAO.java)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageContentDAO.java	(.../WikiPageContentDAO.java)	(revision 49aa132c7b0c31284066f73bf3d823b2f169b2ca)
@@ -1,13 +1,15 @@
 package org.lamsfoundation.lams.tool.wiki.dao.hibernate;
 
-import org.lamsfoundation.lams.tool.wiki.model.WikiPageContent;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.wiki.dao.IWikiPageContentDAO;
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.tool.wiki.model.WikiPageContent;
+import org.springframework.stereotype.Repository;
 
-public class WikiPageContentDAO extends BaseDAO implements IWikiPageContentDAO {
+@Repository
+public class WikiPageContentDAO extends LAMSBaseDAO implements IWikiPageContentDAO {
 
     public void saveOrUpdate(WikiPageContent content) {
-	this.getHibernateTemplate().saveOrUpdate(content);
+    	getSession().saveOrUpdate(content);
     }
 
 }
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java
===================================================================
diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r49aa132c7b0c31284066f73bf3d823b2f169b2ca
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java	(.../WikiPageDAO.java)	(revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java	(.../WikiPageDAO.java)	(revision 49aa132c7b0c31284066f73bf3d823b2f169b2ca)
@@ -2,14 +2,16 @@
 
 import org.hibernate.Query;
 import org.hibernate.SQLQuery;
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.wiki.dao.IWikiPageDAO;
 import org.lamsfoundation.lams.tool.wiki.dto.WikiPageDTO;
 import org.lamsfoundation.lams.tool.wiki.model.Wiki;
 import org.lamsfoundation.lams.tool.wiki.model.WikiPage;
 import org.lamsfoundation.lams.tool.wiki.model.WikiSession;
+import org.springframework.stereotype.Repository;
 
-public class WikiPageDAO extends BaseDAO implements IWikiPageDAO {
+@Repository
+public class WikiPageDAO extends LAMSBaseDAO implements IWikiPageDAO {
 
     public static final String GET_BY_WIKI_AND_TITLE = "from tl_lawiki10_wiki_page in class "
 	    + WikiPage.class.getName() + " where wiki_uid=? AND title=? AND wiki_session_uid=null";
@@ -24,7 +26,7 @@
     public static final String CHANGE_WIKI_JAVASCRIPT_METHOD = "javascript:changeWikiPage('?')";
 
     public void saveOrUpdate(WikiPage wikiPage) {
-	this.getHibernateTemplate().saveOrUpdate(wikiPage);
+    	getSession().saveOrUpdate(wikiPage);
     }
 
     public WikiPage getByWikiAndTitle(Wiki wiki, String title) {
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiSessionDAO.java
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r49aa132c7b0c31284066f73bf3d823b2f169b2ca
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiSessionDAO.java	(.../WikiSessionDAO.java)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiSessionDAO.java	(.../WikiSessionDAO.java)	(revision 49aa132c7b0c31284066f73bf3d823b2f169b2ca)
@@ -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.wiki.dao.IWikiSessionDAO;
 import org.lamsfoundation.lams.tool.wiki.model.WikiSession;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the WikiSession objects - Hibernate specific code.
  */
-public class WikiSessionDAO extends BaseDAO implements IWikiSessionDAO {
+@Repository
+public class WikiSessionDAO extends LAMSBaseDAO implements IWikiSessionDAO {
 
     public static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + WikiSession.class.getName()
 	    + " where session_id=?";
 
     public void saveOrUpdate(WikiSession session) {
-	this.getHibernateTemplate().saveOrUpdate(session);
-	this.getHibernateTemplate().flush();
+    	getSession().saveOrUpdate(session);
+    	getSession().flush();
     }
 
     public WikiSession getBySessionId(Long toolSessionId) {
-	List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId);
+	List list = this.doFind(SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId);
 	if (list == null || list.isEmpty())
 	    return null;
 	return (WikiSession) list.get(0);
@@ -53,8 +55,8 @@
     public void deleteBySessionID(Long toolSessionID) {
 	WikiSession session = getBySessionId(toolSessionID);
 	if (session != null) {
-	    this.getHibernateTemplate().delete(session);
-	    this.getHibernateTemplate().flush();
+		getSession().delete(session);
+		getSession().flush();
 	}
     }
 }
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiUserDAO.java
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r49aa132c7b0c31284066f73bf3d823b2f169b2ca
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiUserDAO.java	(.../WikiUserDAO.java)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiUserDAO.java	(.../WikiUserDAO.java)	(revision 49aa132c7b0c31284066f73bf3d823b2f169b2ca)
@@ -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.wiki.dao.IWikiUserDAO;
 import org.lamsfoundation.lams.tool.wiki.model.WikiUser;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the WikiUser objects - Hibernate specific code.
  */
-public class WikiUserDAO extends BaseDAO implements IWikiUserDAO {
+@Repository
+public class WikiUserDAO extends LAMSBaseDAO implements IWikiUserDAO {
 
     public static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from " + WikiUser.class.getName() + " as f"
 	    + " where user_id=? and f.wikiSession.sessionId=?";
@@ -44,7 +46,7 @@
     private static final String SQL_QUERY_FIND_BY_UID = "from " + WikiUser.class.getName() + " where uid=?";
 
     public WikiUser 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())
@@ -55,7 +57,7 @@
 
     public WikiUser 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())
@@ -66,12 +68,12 @@
     }
 
     public void saveOrUpdate(WikiUser wikiUser) {
-	this.getHibernateTemplate().saveOrUpdate(wikiUser);
-	this.getHibernateTemplate().flush();
+    	getSession().saveOrUpdate(wikiUser);
+    	getSession().flush();
     }
 
     public WikiUser 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;