Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieConfigItemDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieConfigItemDAO.java,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieConfigItemDAO.java	15 Aug 2014 09:58:03 -0000	1.1.2.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieConfigItemDAO.java	29 Nov 2014 21:47:08 -0000	1.1.2.2
@@ -1,27 +1,21 @@
 package org.lamsfoundation.lams.tool.wookie.dao.hibernate;
 
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.wookie.dao.IWookieConfigItemDAO;
 import org.lamsfoundation.lams.tool.wookie.model.WookieConfigItem;
-import org.springframework.orm.hibernate4.HibernateCallback;
+import org.springframework.stereotype.Repository;
 
-public class WookieConfigItemDAO extends BaseDAO implements IWookieConfigItemDAO {
+@Repository
+public class WookieConfigItemDAO extends LAMSBaseDAO implements IWookieConfigItemDAO {
     private static final String LOAD_CONFIG_ITEM_BY_KEY = "from WookieConfigItem configuration"
 	    + " where configuration.configKey=:key";
 
-    public WookieConfigItem getConfigItemByKey(final String configKey) {
-	return (WookieConfigItem) getHibernateTemplate().execute(new HibernateCallback() {
-	    public Object doInHibernate(Session session) throws HibernateException {
-		return session.createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey).uniqueResult();
-	    }
-	});
+	public WookieConfigItem getConfigItemByKey(final String configKey) {
+		return (WookieConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey).uniqueResult();
+	}
 
-    }
-
     public void saveOrUpdate(WookieConfigItem mdlForumConfigItem) {
-	this.getHibernateTemplate().saveOrUpdate(mdlForumConfigItem);
-	this.getHibernateTemplate().flush();
+    	getSession().saveOrUpdate(mdlForumConfigItem);
+    	getSession().flush();
     }
 }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieDAO.java,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieDAO.java	15 Aug 2014 09:58:03 -0000	1.2.2.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieDAO.java	29 Nov 2014 21:47:08 -0000	1.2.2.2
@@ -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.wookie.dao.IWookieDAO;
 import org.lamsfoundation.lams.tool.wookie.model.Wookie;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the Wookie objects - Hibernate specific code.
  */
-public class WookieDAO extends BaseDAO implements IWookieDAO {
+@Repository
+public class WookieDAO extends LAMSBaseDAO implements IWookieDAO {
 
     private static final String FIND_FORUM_BY_CONTENTID = "from Wookie wookie where wookie.toolContentId=?";
 
     @SuppressWarnings("unchecked")
     public Wookie getByContentId(Long toolContentId) {
-	List list = getHibernateTemplate().find(WookieDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
+	List list = doFind(WookieDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
 	if (list != null && list.size() > 0) {
 	    return (Wookie) list.get(0);
 	} else {
@@ -48,8 +50,8 @@
     }
 
     public void saveOrUpdate(Wookie wookie) {
-	this.getHibernateTemplate().saveOrUpdate(wookie);
-	this.getHibernateTemplate().flush();
+    	getSession().saveOrUpdate(wookie);
+    	getSession().flush();
     }
 
     public void releaseFromCache(Object o) {
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieSessionDAO.java,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieSessionDAO.java	28 Jul 2009 05:30:25 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieSessionDAO.java	29 Nov 2014 21:47:08 -0000	1.1.2.1
@@ -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.wookie.dao.IWookieSessionDAO;
 import org.lamsfoundation.lams.tool.wookie.model.WookieSession;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the WookieSession objects - Hibernate specific code.
  */
-public class WookieSessionDAO extends BaseDAO implements IWookieSessionDAO {
+@Repository
+public class WookieSessionDAO extends LAMSBaseDAO implements IWookieSessionDAO {
 
 	public static final String SQL_QUERY_FIND_BY_SESSION_ID = "from "
 			+ WookieSession.class.getName() + " where session_id=?";
 
 	public void saveOrUpdate(WookieSession session) {
-		this.getHibernateTemplate().saveOrUpdate(session);
-		this.getHibernateTemplate().flush();
+		getSession().saveOrUpdate(session);
+		getSession().flush();
 	}
 
 	@SuppressWarnings("unchecked")
 	public WookieSession getBySessionId(Long toolSessionId) {
-		List list = this.getHibernateTemplate().find(
+		List list = this.doFind(
 				SQL_QUERY_FIND_BY_SESSION_ID, toolSessionId);
 		if (list == null || list.isEmpty())
 			return null;
@@ -55,8 +57,8 @@
 	public void deleteBySessionID(Long toolSessionID) {
 		WookieSession session = getBySessionId(toolSessionID);
 		if(session != null){
-			this.getHibernateTemplate().delete(session);
-			this.getHibernateTemplate().flush();
+			getSession().delete(session);
+			getSession().flush();
 		}
 	}
 }
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieUserDAO.java,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieUserDAO.java	28 Jul 2009 05:30:25 -0000	1.1
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dao/hibernate/WookieUserDAO.java	29 Nov 2014 21:47:08 -0000	1.1.2.1
@@ -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.wookie.dao.IWookieUserDAO;
 import org.lamsfoundation.lams.tool.wookie.model.WookieUser;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the WookieUser objects - Hibernate specific code.
  */
-public class WookieUserDAO extends BaseDAO implements IWookieUserDAO {
+@Repository
+public class WookieUserDAO extends LAMSBaseDAO implements IWookieUserDAO {
 
 	public static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from "
 			+ WookieUser.class.getName() + " as f"
@@ -48,7 +50,7 @@
 
 	@SuppressWarnings("unchecked")
 	public WookieUser 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 });
 
@@ -62,7 +64,7 @@
 	public WookieUser getByLoginNameAndSessionId(String loginName,
 			Long toolSessionId) {
 
-		List list = this.getHibernateTemplate().find(
+		List list = this.doFind(
 				SQL_QUERY_FIND_BY_LOGIN_NAME_SESSION_ID,
 				new Object[] { loginName, toolSessionId });
 
@@ -74,13 +76,13 @@
 	}
 
 	public void saveOrUpdate(WookieUser wookieUser) {
-		this.getHibernateTemplate().saveOrUpdate(wookieUser);
-		this.getHibernateTemplate().flush();
+		getSession().saveOrUpdate(wookieUser);
+		getSession().flush();
 	}
 
 	@SuppressWarnings("unchecked")
 	public WookieUser getByUID(Long uid) {
-		List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_UID,
+		List list = this.doFind(SQL_QUERY_FIND_BY_UID,
 				new Object[] { uid });
 
 		if (list == null || list.isEmpty())