Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java,v
diff -u -r1.9.2.1 -r1.9.2.2
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java	15 Aug 2014 09:59:19 -0000	1.9.2.1
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java	1 Dec 2014 21:09:40 -0000	1.9.2.2
@@ -25,24 +25,20 @@
 package org.lamsfoundation.lams.tool.noticeboard.dao.hibernate;
 
 import java.util.List;
-import java.lang.Long;
 
 import org.hibernate.FlushMode;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
 import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO;
-import org.springframework.orm.hibernate4.HibernateCallback;
-import org.springframework.orm.hibernate4.HibernateTemplate;
-import org.springframework.orm.hibernate4.support.HibernateDaoSupport;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author mtruong
  * <p>Hibernate implementation for database access to Noticeboard content for the noticeboard tool.</p>
  */
-
-public class NoticeboardContentDAO extends HibernateDaoSupport implements INoticeboardContentDAO {
+@Repository
+public class NoticeboardContentDAO extends LAMSBaseDAO implements INoticeboardContentDAO {
 	
 	private static final String FIND_NB_CONTENT = "from " + NoticeboardContent.class.getName() + " as nb where nb.nbContentId=?";
 	
@@ -54,15 +50,15 @@
 	/** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#getNbContentByUID(java.lang.Long) */
 	public NoticeboardContent getNbContentByUID(Long uid)
 	{
-		 return (NoticeboardContent) this.getHibernateTemplate()
+		 return (NoticeboardContent) this.getSession()
          .get(NoticeboardContent.class, uid);
 	}
 	
 	/** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#findNbContentById(java.lang.Long) */
 	public NoticeboardContent findNbContentById(Long nbContentId)
 	{
 	    String query = "from NoticeboardContent as nb where nb.nbContentId = ?";
-		List content = getHibernateTemplate().find(query,nbContentId);
+		List content = doFind(query,nbContentId);
 			
 		if(content!=null && content.size() == 0)
 		{			
@@ -76,32 +72,21 @@
 	}
     	
 	/** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#getNbContentBySession(java.lang.Long) */
-	public NoticeboardContent getNbContentBySession(final Long nbSessionId)
-	{
-		 return (NoticeboardContent) getHibernateTemplate().execute(new HibernateCallback()
-                {
-
-                    public Object doInHibernate(Session session) throws HibernateException
-                    {
-                        return session.createQuery(LOAD_NB_BY_SESSION)
-                                      .setLong("sessionId",
-                                      		nbSessionId.longValue())
-                                      .uniqueResult();
-                    }
-                });
-	}
+	public NoticeboardContent getNbContentBySession(final Long nbSessionId) {
+		return (NoticeboardContent) getSession().createQuery(LOAD_NB_BY_SESSION)
+				.setLong("sessionId", nbSessionId.longValue()).uniqueResult();
+	}	
 	
-	
 	/** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#saveNbContent(org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent) */
 	public void saveNbContent(NoticeboardContent nbContent)
     {
-    	this.getHibernateTemplate().save(nbContent);
+    	this.getSession().save(nbContent);
     }
     
 	/** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#updateNbContent(org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent) */
 	public void updateNbContent(NoticeboardContent nbContent)
     {
-    	this.getHibernateTemplate().update(nbContent);
+    	this.getSession().update(nbContent);
     }
 
    
@@ -117,8 +102,8 @@
 			if(list != null && list.size() > 0){
 				NoticeboardContent nb = (NoticeboardContent) list.get(0);
 				getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
-				this.getHibernateTemplate().delete(nb);
-				this.getHibernateTemplate().flush();
+				this.getSession().delete(nb);
+				this.getSession().flush();
 			}
 		}
     }
@@ -132,7 +117,7 @@
     /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#removeNbSessions(org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent)*/
     public void removeNbSessions(NoticeboardContent nbContent)
     {
-    	this.getHibernateTemplate().deleteAll(nbContent.getNbSessions());
+    	this.deleteAll(nbContent.getNbSessions());
     }
     
     /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO#addNbSession(java.lang.Long, org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession) */
@@ -141,13 +126,13 @@
         NoticeboardContent content = findNbContentById(nbContentId);
         nbSession.setNbContent(content);
         content.getNbSessions().add(nbSession);
-        this.getHibernateTemplate().saveOrUpdate(nbSession);
-        this.getHibernateTemplate().saveOrUpdate(content);        
+        this.getSession().saveOrUpdate(nbSession);
+        this.getSession().saveOrUpdate(content);        
     }
 
     @Override
     public void delete(Object object) {
-	getHibernateTemplate().delete(object);
+    	getSession().delete(object);
     }
   
 }
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java,v
diff -u -r1.10.14.2 -r1.10.14.3
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java	3 Sep 2014 10:34:16 -0000	1.10.14.2
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java	1 Dec 2014 21:09:40 -0000	1.10.14.3
@@ -27,23 +27,20 @@
 import java.util.List;
 
 import org.hibernate.FlushMode;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser;
 import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO;
-import org.springframework.orm.hibernate4.HibernateCallback;
-import org.springframework.orm.hibernate4.HibernateTemplate;
-import org.springframework.orm.hibernate4.support.HibernateDaoSupport;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author mtruong
  *         <p>
  *         Hibernate implementation for database access to Noticeboard sessions for the noticeboard tool.
  *         </p>
  */
-
-public class NoticeboardSessionDAO extends HibernateDaoSupport implements INoticeboardSessionDAO {
+@Repository
+public class NoticeboardSessionDAO extends LAMSBaseDAO implements INoticeboardSessionDAO {
 	
     private static final String FIND_NB_SESSION = "from " + NoticeboardSession.class.getName()
 	    + " as nb where nb.nbSessionId=?";
@@ -56,7 +53,7 @@
     @Override
     public NoticeboardSession findNbSessionById(Long nbSessionId) {
 	    String query = "from NoticeboardSession nbS where nbS.nbSessionId=?";
-	List<NoticeboardSession> session = (List<NoticeboardSession>) getHibernateTemplate().find(query, nbSessionId);
+	List<NoticeboardSession> session = (List<NoticeboardSession>) doFind(query, nbSessionId);
 		
 	if ((session != null) && (session.size() == 0)) {
 			return null;
@@ -68,14 +65,14 @@
     /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#saveNbSession(org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession) */
     @Override
     public void saveNbSession(NoticeboardSession nbSession) {
-    	this.getHibernateTemplate().save(nbSession);
+    	this.getSession().save(nbSession);
     }
     
 	
     /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#updateNbSession(org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession) */
     @Override
     public void updateNbSession(NoticeboardSession nbSession) {
-    	this.getHibernateTemplate().update(nbSession);
+    	this.getSession().update(nbSession);
     }
 
  
@@ -84,7 +81,6 @@
     @Override
     public void removeNbSession(Long nbSessionId) {
        
-    	HibernateTemplate templ = this.getHibernateTemplate();
 		if ( nbSessionId != null) {
 			//String query = "from org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent as nb where nb.nbContentId=?";
 			List<NoticeboardSession> list = getSessionFactory().getCurrentSession().createQuery(FIND_NB_SESSION)
@@ -94,8 +90,8 @@
 	    if ((list != null) && (list.size() > 0)) {
 				NoticeboardSession nb = (NoticeboardSession) list.get(0);
 				getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
-				templ.delete(nb);
-				templ.flush();
+				getSession().delete(nb);
+				getSession().flush();
 			}
 		}
       
@@ -105,28 +101,21 @@
     @Override
     public void removeNbSession(NoticeboardSession nbSession) {
     	removeNbSession(nbSession.getNbSessionId());
-        //this.getHibernateTemplate().delete(nbSession);
     }
 
     
     /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#getNbSessionByUser(java.lang.Long) */
     @Override
-    public NoticeboardSession getNbSessionByUser(final Long userId) {
-	return (NoticeboardSession) getHibernateTemplate().execute(new HibernateCallback() {
-
-	    @Override
-	    public Object doInHibernate(Session session) throws HibernateException {
-		return session.createQuery(NoticeboardSessionDAO.LOAD_NBSESSION_BY_USER)
-			.setLong("userId", userId.longValue()).uniqueResult();
-                    }
-                });
+	public NoticeboardSession getNbSessionByUser(final Long userId) {
+		return (NoticeboardSession) getSession().createQuery(NoticeboardSessionDAO.LOAD_NBSESSION_BY_USER)
+				.setLong("userId", userId.longValue()).uniqueResult();
 	}
 	
 	 
     /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#removeNbUsers(org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession) */
     @Override
     public void removeNbUsers(NoticeboardSession nbSession) {
-    	this.getHibernateTemplate().deleteAll(nbSession.getNbUsers());
+    	deleteAll(nbSession.getNbUsers());
     }
 	
     /**
@@ -138,7 +127,7 @@
 	    NoticeboardSession session = findNbSessionById(nbSessionId);
 	    user.setNbSession(session);
 	    session.getNbUsers().add(user);
-	    this.getHibernateTemplate().saveOrUpdate(user);
-	    this.getHibernateTemplate().merge(session);	    
+	    this.getSession().saveOrUpdate(user);
+	    this.getSession().merge(session);	    
 	}
 }
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java,v
diff -u -r1.9.14.1 -r1.9.14.2
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java	15 Aug 2014 09:59:19 -0000	1.9.14.1
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java	1 Dec 2014 21:09:40 -0000	1.9.14.2
@@ -27,18 +27,18 @@
 import java.util.List;
 
 import org.hibernate.FlushMode;
-import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO;
-import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
-import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser;
-import org.springframework.orm.hibernate4.HibernateTemplate;
-import org.springframework.orm.hibernate4.support.HibernateDaoSupport;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
+import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser;
+import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author mtruong
  * <p>Hibernate implementation for database access to Noticeboard users (learners) for the noticeboard tool.</p>
  */
-public class NoticeboardUserDAO extends HibernateDaoSupport implements INoticeboardUserDAO {
+@Repository
+public class NoticeboardUserDAO extends LAMSBaseDAO implements INoticeboardUserDAO {
     
 	private static final String FIND_NB_USER = "from " + NoticeboardUser.class.getName() + " as nb where nb.userId=?";
 	
@@ -54,7 +54,7 @@
 	    Object[] values = new Object[2];
 	    values[0] = userId;
 	    values[1] = sessionId;
-	    List users = getHibernateTemplate().find(query,values);
+	    List users = doFind(query,values);
 		if(users!=null && users.size() == 0)
 		{			
 			return null;
@@ -85,13 +85,13 @@
 	/** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO#saveNbUser(org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser) */
 	public void saveNbUser(NoticeboardUser nbUser)
     {
-    	this.getHibernateTemplate().save(nbUser);
+    	this.getSession().save(nbUser);
     }
 	
 	/** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO#updateNbUser(org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser) */
     public void updateNbUser(NoticeboardUser nbUser)
     {
-    	this.getHibernateTemplate().update(nbUser);
+    	this.getSession().update(nbUser);
     }
     
     /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO#removeNbUser(java.lang.Long) */
@@ -106,8 +106,8 @@
 			if(list != null && list.size() > 0){
 				NoticeboardUser nb = (NoticeboardUser) list.get(0);
 				getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
-				this.getHibernateTemplate().delete(nb);
-				this.getHibernateTemplate().flush();
+				this.getSession().delete(nb);
+				this.getSession().flush();
 			}
 		}
       
@@ -116,20 +116,19 @@
     /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO#removeNbUser(org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser) */
     public void removeNbUser(NoticeboardUser nbUser)
     {
-       // this.getHibernateTemplate().delete(nbUser);
     	removeNbUser(nbUser.getUserId());
     }
     
     /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO#getNumberOfUsers((org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession) */
     public int getNumberOfUsers(NoticeboardSession nbSession)
     {
-        return (getHibernateTemplate().findByNamedParam(COUNT_USERS_IN_SESSION,
-	            "nbSession",
-				nbSession)).size();
+        return (doFindByNamedParam(COUNT_USERS_IN_SESSION,
+        		new String[] {"nbSession"},
+        		new Object[] {nbSession})).size();
     }
     
     public List getNbUsersBySession(Long sessionId) {
     	String query = "from NoticeboardUser user where user.nbSession.nbSessionId=?";
-	    return getHibernateTemplate().find(query,sessionId);
+	    return doFind(query,sessionId);
     }
 }
\ No newline at end of file