Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java
===================================================================
diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r272f64ea6312bb9336a3165186e2c294d714f340
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java	(.../SubmissionDetailsDAO.java)	(revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java	(.../SubmissionDetailsDAO.java)	(revision 272f64ea6312bb9336a3165186e2c294d714f340)
@@ -27,15 +27,17 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author Manpreet Minhas
  */
-public class SubmissionDetailsDAO extends BaseDAO implements
+@Repository
+public class SubmissionDetailsDAO extends LAMSBaseDAO implements
 		ISubmissionDetailsDAO {
 	
 	private static final String FIND_BY_SESSION = "from " + SubmissionDetails.class.getName() + " as d where d.submitFileSession.sessionID=? ";
@@ -47,8 +49,7 @@
 	 * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO#getSubmissionDetailsByID(java.lang.Long)
 	 */
 	public SubmissionDetails getSubmissionDetailsByID(Long submissionID) {
-		return (SubmissionDetails) this.getHibernateTemplate().
-								   get(SubmissionDetails.class, submissionID);
+		return (SubmissionDetails) getSession().get(SubmissionDetails.class, submissionID);
 	}
 	
 
@@ -57,7 +58,7 @@
 	 * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO#saveOrUpdate(org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession)
 	 */
 	public void saveOrUpdate(SubmitFilesSession session) {
-		this.getHibernateTemplate().saveOrUpdate(session);
+		getSession().saveOrUpdate(session);
 		
 	}
 	/* (non-Javadoc)
@@ -75,7 +76,7 @@
 	@SuppressWarnings("unchecked")
 	public List<SubmissionDetails> getBySessionAndLearner(Long sessionID, Integer userID){
 		
-		return (List<SubmissionDetails>) this.getHibernateTemplate().find(FIND_BY_SESSION_LEARNER, new Object[]{sessionID,userID});
+		return (List<SubmissionDetails>) doFind(FIND_BY_SESSION_LEARNER, new Object[]{sessionID,userID});
 		
 	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r272f64ea6312bb9336a3165186e2c294d714f340
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java	(.../SubmitFilesContentDAO.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java	(.../SubmitFilesContentDAO.java)	(revision 272f64ea6312bb9336a3165186e2c294d714f340)
@@ -25,14 +25,16 @@
 
 package org.lamsfoundation.lams.tool.sbmt.dao.hibernate;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author Manpreet Minhas
  */
-public class SubmitFilesContentDAO extends BaseDAO implements ISubmitFilesContentDAO {
+@Repository
+public class SubmitFilesContentDAO extends LAMSBaseDAO implements ISubmitFilesContentDAO {
 
 	/**
 	 * (non-Javadoc)
@@ -46,7 +48,7 @@
 	 * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO#save(org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent)
 	 */
 	public void saveOrUpdate(SubmitFilesContent content) {
-		this.getHibernateTemplate().saveOrUpdate(content);
+		getSession().saveOrUpdate(content);
 	}
 		
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r272f64ea6312bb9336a3165186e2c294d714f340
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java	(.../SubmitFilesReportDAO.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java	(.../SubmitFilesReportDAO.java)	(revision 272f64ea6312bb9336a3165186e2c294d714f340)
@@ -27,15 +27,16 @@
 
 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.sbmt.SubmitFilesReport;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesReportDAO;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author Manpreet Minhas
  */
-public class SubmitFilesReportDAO extends BaseDAO implements
+@Repository
+public class SubmitFilesReportDAO extends LAMSBaseDAO implements
 		ISubmitFilesReportDAO {
 	
 	private static final String FIND_BY_SUBMISSION = "from " + SubmitFilesReport.class.getName() + 
@@ -55,7 +56,7 @@
 	 */
 	public SubmitFilesReport getReportBySubmissionID(Long submissionID){
 		
-		List list = this.getHibernateTemplate().find(FIND_BY_SUBMISSION,submissionID);
+		List list = doFind(FIND_BY_SUBMISSION,submissionID);
 		if(list!=null)
 			return (SubmitFilesReport)list.get(0);
 		else
@@ -66,6 +67,6 @@
 	 * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesReportDAO#updateReport(org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport)
 	 */
 	public void updateReport(SubmitFilesReport report) {
-		getHibernateTemplate().update(report);
+		getSession().update(report);
 	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java
===================================================================
diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r272f64ea6312bb9336a3165186e2c294d714f340
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java	(.../SubmitFilesSessionDAO.java)	(revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java	(.../SubmitFilesSessionDAO.java)	(revision 272f64ea6312bb9336a3165186e2c294d714f340)
@@ -27,14 +27,16 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesSessionDAO;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author Manpreet Minhas
  */
-public class SubmitFilesSessionDAO extends BaseDAO implements
+@Repository
+public class SubmitFilesSessionDAO extends LAMSBaseDAO implements
 		ISubmitFilesSessionDAO {
 
     private static final String FIND_LEARNER_BY_CONTENT_ID = 
@@ -54,7 +56,7 @@
 	 * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesSessionDAO#createSession(org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession)
 	 */
 	public void createSession(SubmitFilesSession submitSession) {
-		 this.getHibernateTemplate().save(submitSession);
+		 getSession().save(submitSession);
 	}
     
     public List<SubmitFilesSession> getSubmitFilesSessionByContentID(Long contentID){
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java
===================================================================
diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -r272f64ea6312bb9336a3165186e2c294d714f340
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java	(.../SubmitUserDAO.java)	(revision 2aaccb954583cd8431759dca8e912a8fe863aa0e)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java	(.../SubmitUserDAO.java)	(revision 272f64ea6312bb9336a3165186e2c294d714f340)
@@ -25,14 +25,15 @@
 
 package org.lamsfoundation.lams.tool.sbmt.dao.hibernate;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.sbmt.SubmitUser;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitUserDAO;
+import org.springframework.stereotype.Repository;
 
-public class SubmitUserDAO extends BaseDAO implements ISubmitUserDAO {
+@Repository
+public class SubmitUserDAO extends LAMSBaseDAO implements ISubmitUserDAO {
 	private static final String FIND_BY_USER_ID_SESSION_ID = "from " + SubmitUser.class.getName() +
 	 		" where user_id=? and session_id=?";
 	private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + SubmitUser.class.getName() +
@@ -42,15 +43,15 @@
 	
 	
 	public SubmitUser getLearner(Long sessionID, Integer userID) {
-		List list = getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID,new Object[]{userID,sessionID});
+		List list = doFind(FIND_BY_USER_ID_SESSION_ID,new Object[]{userID,sessionID});
 		if(list.size() > 0)
 			return (SubmitUser) list.get(0);
 		else
 			return null;
 	}
 
 	public SubmitUser getContentUser(Long contentId, Integer userID) {
-		List list = getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID,new Object[]{userID,contentId});
+		List list = doFind(FIND_BY_USER_ID_CONTENT_ID,new Object[]{userID,contentId});
 		if(list.size() > 0)
 			return (SubmitUser) list.get(0);
 		else
@@ -59,7 +60,7 @@
 	
 	@SuppressWarnings("unchecked")
 	public List<SubmitUser> getUsersBySession(Long sessionID){
-		return (List<SubmitUser>) getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionID);
+		return (List<SubmitUser>) doFind(FIND_BY_SESSION_ID,sessionID);
 	}