Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrConfigItemDAO.java
===================================================================
diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r995f9d6e3f136980d5823cedd1cae2f2e9773820
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrConfigItemDAO.java	(.../PixlrConfigItemDAO.java)	(revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrConfigItemDAO.java	(.../PixlrConfigItemDAO.java)	(revision 995f9d6e3f136980d5823cedd1cae2f2e9773820)
@@ -1,27 +1,22 @@
 package org.lamsfoundation.lams.tool.pixlr.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.pixlr.dao.IPixlrConfigItemDAO;
 import org.lamsfoundation.lams.tool.pixlr.model.PixlrConfigItem;
-import org.springframework.orm.hibernate4.HibernateCallback;
+import org.springframework.stereotype.Repository;
 
-public class PixlrConfigItemDAO extends BaseDAO implements IPixlrConfigItemDAO {
+@Repository
+public class PixlrConfigItemDAO extends LAMSBaseDAO implements IPixlrConfigItemDAO {
     private static final String LOAD_CONFIG_ITEM_BY_KEY = "from PixlrConfigItem configuration"
 	    + " where configuration.configKey=:key";
 
-    public PixlrConfigItem getConfigItemByKey(final String configKey) {
-	return (PixlrConfigItem) getHibernateTemplate().execute(new HibernateCallback() {
-	    public Object doInHibernate(Session session) throws HibernateException {
-		return session.createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey).uniqueResult();
-	    }
-	});
+	public PixlrConfigItem getConfigItemByKey(final String configKey) {
+		return (PixlrConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setString("key", configKey).uniqueResult();
 
-    }
+	}
 
     public void saveOrUpdate(PixlrConfigItem mdlForumConfigItem) {
-	this.getHibernateTemplate().saveOrUpdate(mdlForumConfigItem);
-	this.getHibernateTemplate().flush();
+	getSession().saveOrUpdate(mdlForumConfigItem);
+	getSession().flush();
     }
 }
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java
===================================================================
diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r995f9d6e3f136980d5823cedd1cae2f2e9773820
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java	(.../PixlrDAO.java)	(revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrDAO.java	(.../PixlrDAO.java)	(revision 995f9d6e3f136980d5823cedd1cae2f2e9773820)
@@ -26,22 +26,22 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.pixlr.dao.IPixlrDAO;
 import org.lamsfoundation.lams.tool.pixlr.model.Pixlr;
-import org.springframework.orm.hibernate4.HibernateTemplate;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the Pixlr objects - Hibernate specific code.
  */
-public class PixlrDAO extends BaseDAO implements IPixlrDAO {
+@Repository
+public class PixlrDAO extends LAMSBaseDAO implements IPixlrDAO {
 
     private static final String FIND_FORUM_BY_CONTENTID = "from Pixlr pixlr where pixlr.toolContentId=?";
 
     @SuppressWarnings("unchecked")
     public Pixlr getByContentId(Long toolContentId) {
-	List list = getHibernateTemplate().find(PixlrDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
+	List list = doFind(PixlrDAO.FIND_FORUM_BY_CONTENTID, toolContentId);
 	if (list != null && list.size() > 0) {
 	    return (Pixlr) list.get(0);
 	} else {
@@ -50,8 +50,8 @@
     }
 
     public void saveOrUpdate(Pixlr pixlr) {
-	this.getHibernateTemplate().saveOrUpdate(pixlr);
-	this.getHibernateTemplate().flush();
+	getSession().saveOrUpdate(pixlr);
+	getSession().flush();
     }
 
     public void releaseFromCache(Object o) {
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrSessionDAO.java
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r995f9d6e3f136980d5823cedd1cae2f2e9773820
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrSessionDAO.java	(.../PixlrSessionDAO.java)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrSessionDAO.java	(.../PixlrSessionDAO.java)	(revision 995f9d6e3f136980d5823cedd1cae2f2e9773820)
@@ -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.pixlr.dao.IPixlrSessionDAO;
 import org.lamsfoundation.lams.tool.pixlr.model.PixlrSession;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the PixlrSession objects - Hibernate specific code.
  */
-public class PixlrSessionDAO extends BaseDAO implements IPixlrSessionDAO {
+@Repository
+public class PixlrSessionDAO extends LAMSBaseDAO implements IPixlrSessionDAO {
 
 	public static final String SQL_QUERY_FIND_BY_SESSION_ID = "from "
 			+ PixlrSession.class.getName() + " where session_id=?";
 
 	public void saveOrUpdate(PixlrSession session) {
-		this.getHibernateTemplate().saveOrUpdate(session);
-		this.getHibernateTemplate().flush();
+		getSession().saveOrUpdate(session);
+		getSession().flush();
 	}
 
 	@SuppressWarnings("unchecked")
 	public PixlrSession 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;
@@ -55,8 +57,8 @@
 	public void deleteBySessionID(Long toolSessionID) {
 		PixlrSession session = getBySessionId(toolSessionID);
 		if(session != null){
-			this.getHibernateTemplate().delete(session);
-			this.getHibernateTemplate().flush();
+			getSession().delete(session);
+			getSession().flush();
 		}
 	}
 }
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrUserDAO.java
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r995f9d6e3f136980d5823cedd1cae2f2e9773820
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrUserDAO.java	(.../PixlrUserDAO.java)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dao/hibernate/PixlrUserDAO.java	(.../PixlrUserDAO.java)	(revision 995f9d6e3f136980d5823cedd1cae2f2e9773820)
@@ -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.pixlr.dao.IPixlrUserDAO;
 import org.lamsfoundation.lams.tool.pixlr.model.PixlrUser;
+import org.springframework.stereotype.Repository;
 
 /**
  * DAO for accessing the PixlrUser objects - Hibernate specific code.
  */
-public class PixlrUserDAO extends BaseDAO implements IPixlrUserDAO {
+@Repository
+public class PixlrUserDAO extends LAMSBaseDAO implements IPixlrUserDAO {
 
 	public static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from "
 			+ PixlrUser.class.getName() + " as f"
@@ -48,7 +50,7 @@
 
 	@SuppressWarnings("unchecked")
 	public PixlrUser 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 PixlrUser 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 });
 
@@ -74,13 +76,13 @@
 	}
 
 	public void saveOrUpdate(PixlrUser pixlrUser) {
-		this.getHibernateTemplate().saveOrUpdate(pixlrUser);
-		this.getHibernateTemplate().flush();
+		getSession().saveOrUpdate(pixlrUser);
+		getSession().flush();
 	}
 
 	@SuppressWarnings("unchecked")
 	public PixlrUser 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())