Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java
===================================================================
diff -u -rc6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8 -r5333baae8a3686d3bf2bfbfde363b977959293ed
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java	(.../CredentialDAO.java)	(revision c6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java	(.../CredentialDAO.java)	(revision 5333baae8a3686d3bf2bfbfde363b977959293ed)
@@ -34,7 +34,8 @@
 import org.lamsfoundation.lams.contentrepository.IWorkspace;
 import org.lamsfoundation.lams.contentrepository.RepositoryRuntimeException;
 import org.lamsfoundation.lams.contentrepository.dao.ICredentialDAO;
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.springframework.stereotype.Repository;
 
 /**
  * 
@@ -43,7 +44,8 @@
  * @author Fiona Malikoff
  * 
  */
-public class CredentialDAO extends BaseDAO implements ICredentialDAO {
+@Repository
+public class CredentialDAO extends LAMSBaseDAO implements ICredentialDAO {
     private Logger log = Logger.getLogger(CredentialDAO.class);
 
     private static final String GET_CREDENTIAL = "FROM " + CrCredential.class.getName() + " AS cr WHERE cr.name = ?";
@@ -112,7 +114,7 @@
 	    log.debug("Getting credential for name " + name);
 	}
 
-	List<CrCredential> credentials = (List<CrCredential>) getHibernateTemplate().find(CredentialDAO.GET_CREDENTIAL,
+	List<CrCredential> credentials = (List<CrCredential>) doFind(CredentialDAO.GET_CREDENTIAL,
 		name);
 	return credentials.size() == 0 ? null : credentials.get(0);
     }
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r5333baae8a3686d3bf2bfbfde363b977959293ed
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java	(.../NodeDAO.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java	(.../NodeDAO.java)	(revision 5333baae8a3686d3bf2bfbfde363b977959293ed)
@@ -30,7 +30,8 @@
 import org.lamsfoundation.lams.contentrepository.CrNode;
 import org.lamsfoundation.lams.contentrepository.CrNodeVersion;
 import org.lamsfoundation.lams.contentrepository.dao.INodeDAO;
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.springframework.stereotype.Repository;
 
 
 
@@ -39,12 +40,13 @@
  * 
  * @author Fiona Malikoff
  */
-public class NodeDAO extends BaseDAO implements INodeDAO  {
+@Repository
+public class NodeDAO extends LAMSBaseDAO implements INodeDAO  {
 
 	protected Logger log = Logger.getLogger(NodeDAO.class);	
 
 	public void saveOrUpdate(Object object) {
-		this.getHibernateTemplate().saveOrUpdate(object);		
+		this.saveOrUpdate(object);		
 	}
 	
 	/** Get all child nodes for a node/version.
@@ -62,7 +64,7 @@
 			log.debug("Getting all child nodes for "+parentNodeVersion);
 		
 		String queryString = "from CrNode as n where n.parentNodeVersion = ?";
-		List nodes = getHibernateTemplate().find(queryString,parentNodeVersion);
+		List nodes = doFind(queryString,parentNodeVersion);
 		
 		if(nodes.size() == 0){
 			log.debug("No nodes found");
@@ -92,7 +94,7 @@
 			log.debug("Getting child node from "+parentNodeVersion+" path "+relPath);
 		
 		String queryString = "from CrNode as n where n.parentNodeVersion = ? and n.path = ? ";
-		List nodes = getHibernateTemplate().find(queryString,new Object[] {parentNodeVersion, relPath});
+		List nodes = doFind(queryString,new Object[] {parentNodeVersion, relPath});
 		
 		if(nodes.size() == 0){
 			log.debug("No nodes found");
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java
===================================================================
diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r5333baae8a3686d3bf2bfbfde363b977959293ed
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java	(.../WorkspaceDAO.java)	(revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java	(.../WorkspaceDAO.java)	(revision 5333baae8a3686d3bf2bfbfde363b977959293ed)
@@ -33,8 +33,9 @@
 import org.lamsfoundation.lams.contentrepository.CrWorkspace;
 import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.contentrepository.dao.IWorkspaceDAO;
-import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.springframework.orm.hibernate4.HibernateObjectRetrievalFailureException;
+import org.springframework.stereotype.Repository;
 
 
 
@@ -43,7 +44,8 @@
  * 
  * @author Fiona Malikoff
  */
-public class WorkspaceDAO extends BaseDAO implements IWorkspaceDAO  {
+@Repository
+public class WorkspaceDAO extends LAMSBaseDAO implements IWorkspaceDAO  {
 
 	protected Logger log = Logger.getLogger(WorkspaceDAO.class);	
 
@@ -58,7 +60,7 @@
 		log.debug("Getting workspace for name "+workspaceName);
 		
 		String queryString = "from CrWorkspace as w where w.name = ?";
-		List workspaces = getHibernateTemplate().find(queryString,workspaceName);
+		List workspaces = doFind(queryString,workspaceName);
 		
 		if(workspaces.size() == 0){
 			log.debug("No workspaces found");