Fisheye: Tag c70338ac317b645a997bda4c7d1252a5fee44f66 refers to a dead (removed) revision in file `lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/BaseDAOHibernate.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureConditionDAOHibernate.java
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -rc70338ac317b645a997bda4c7d1252a5fee44f66
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureConditionDAOHibernate.java	(.../EadventureConditionDAOHibernate.java)	(revision 7322054ababd8f5387c3424cdd38d99c3ab49e02)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureConditionDAOHibernate.java	(.../EadventureConditionDAOHibernate.java)	(revision c70338ac317b645a997bda4c7d1252a5fee44f66)
@@ -24,8 +24,11 @@
 package org.eucm.lams.tool.eadventure.dao.hibernate; 
 
 import org.eucm.lams.tool.eadventure.dao.EadventureConditionDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.springframework.stereotype.Repository;
  
-public class EadventureConditionDAOHibernate extends BaseDAOHibernate implements EadventureConditionDAO {
+@Repository
+public class EadventureConditionDAOHibernate extends LAMSBaseDAO implements EadventureConditionDAO {
 
 }
  
\ No newline at end of file
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureDAOHibernate.java
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -rc70338ac317b645a997bda4c7d1252a5fee44f66
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureDAOHibernate.java	(.../EadventureDAOHibernate.java)	(revision 7322054ababd8f5387c3424cdd38d99c3ab49e02)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureDAOHibernate.java	(.../EadventureDAOHibernate.java)	(revision c70338ac317b645a997bda4c7d1252a5fee44f66)
@@ -27,18 +27,21 @@
 
 import org.eucm.lams.tool.eadventure.dao.EadventureDAO;
 import org.eucm.lams.tool.eadventure.model.Eadventure;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.springframework.stereotype.Repository;
 
 /**
  * 
  * @author Steve.Ni
  * 
  * @version $Revision$
  */
-public class EadventureDAOHibernate extends BaseDAOHibernate implements EadventureDAO{
+@Repository
+public class EadventureDAOHibernate extends LAMSBaseDAO implements EadventureDAO{
 	private static final String GET_RESOURCE_BY_CONTENTID = "from "+Eadventure.class.getName()+" as r where r.contentId=?";
 	
 	public Eadventure getByContentId(Long contentId) {
-		List list = getHibernateTemplate().find(GET_RESOURCE_BY_CONTENTID,contentId);
+		List list = doFind(GET_RESOURCE_BY_CONTENTID,contentId);
 		if(list.size() > 0)
 			return (Eadventure) list.get(0);
 		else
@@ -50,7 +53,7 @@
 	}
 
 	public void delete(Eadventure eadventure) {
-		this.getHibernateTemplate().delete(eadventure);
+		getSession().delete(eadventure);
 	}
 
 }
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureExpressionDAOHibernate.java
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -rc70338ac317b645a997bda4c7d1252a5fee44f66
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureExpressionDAOHibernate.java	(.../EadventureExpressionDAOHibernate.java)	(revision 7322054ababd8f5387c3424cdd38d99c3ab49e02)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureExpressionDAOHibernate.java	(.../EadventureExpressionDAOHibernate.java)	(revision c70338ac317b645a997bda4c7d1252a5fee44f66)
@@ -24,8 +24,11 @@
 package org.eucm.lams.tool.eadventure.dao.hibernate; 
 
 import org.eucm.lams.tool.eadventure.dao.EadventureExpressionDAO;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.springframework.stereotype.Repository;
  
-public class EadventureExpressionDAOHibernate extends BaseDAOHibernate implements EadventureExpressionDAO {
+@Repository
+public class EadventureExpressionDAOHibernate extends LAMSBaseDAO implements EadventureExpressionDAO {
 
 }
  
\ No newline at end of file
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureItemVisitDAOHibernate.java
===================================================================
diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rc70338ac317b645a997bda4c7d1252a5fee44f66
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureItemVisitDAOHibernate.java	(.../EadventureItemVisitDAOHibernate.java)	(revision 2aaccb954583cd8431759dca8e912a8fe863aa0e)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureItemVisitDAOHibernate.java	(.../EadventureItemVisitDAOHibernate.java)	(revision c70338ac317b645a997bda4c7d1252a5fee44f66)
@@ -23,19 +23,19 @@
 /* $$Id$$ */
 package org.eucm.lams.tool.eadventure.dao.hibernate;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.eucm.lams.tool.eadventure.dao.EadventureItemVisitDAO;
-import org.eucm.lams.tool.eadventure.dto.Summary;
 import org.eucm.lams.tool.eadventure.model.Eadventure;
 import org.eucm.lams.tool.eadventure.model.EadventureItemVisitLog;
 import org.eucm.lams.tool.eadventure.model.EadventureSession;
-import org.eucm.lams.tool.eadventure.model.EadventureUser;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.springframework.stereotype.Repository;
 
-public class EadventureItemVisitDAOHibernate extends BaseDAOHibernate implements EadventureItemVisitDAO{
+@Repository
+public class EadventureItemVisitDAOHibernate extends LAMSBaseDAO implements EadventureItemVisitDAO{
 	
 	private static final String FIND_BY_ITEM_AND_USER = "from " + EadventureItemVisitLog.class.getName()
 			+ " as r where r.user.userId = ? and r.eadventure.uid = ?";
@@ -66,14 +66,14 @@
 	
 	*/
 	public EadventureItemVisitLog getEadventureItemLog(Long itemUid,Long userId){
-		List list = getHibernateTemplate().find(FIND_BY_ITEM_AND_USER,new Object[]{userId,itemUid});
+		List list = doFind(FIND_BY_ITEM_AND_USER,new Object[]{userId,itemUid});
 		if(list == null || list.size() ==0)
 			return null;
 		return (EadventureItemVisitLog) list.get(0);
 	}
 
 	public int getUserViewLogCount(Long toolSessionId ,Long userUid) {
-		List list = getHibernateTemplate().find(FIND_VIEW_COUNT_BY_USER,new Object[]{toolSessionId, userUid});
+		List list = doFind(FIND_VIEW_COUNT_BY_USER,new Object[]{toolSessionId, userUid});
 		if(list == null || list.size() ==0)
 			return 0;
 		return ((Number) list.get(0)).intValue();
@@ -84,7 +84,7 @@
 	public Map<Long,Integer> getSummary(Long contentId) {
 
 		// Note: Hibernate 3.1 query.uniqueResult() returns Integer, Hibernate 3.2 query.uniqueResult() returns Long
-		List<Object[]> result =  (List<Object[]>) getHibernateTemplate().find(FIND_SUMMARY,contentId);
+		List<Object[]> result =  (List<Object[]>) doFind(FIND_SUMMARY,contentId);
 		Map<Long,Integer>  summaryList = new HashMap<Long,Integer> (result.size());
 		for(Object[] list : result){
 			if ( list[1] != null ) {
@@ -97,7 +97,7 @@
 
 	public List<EadventureItemVisitLog> getEadventureItemLogBySession(Long sessionId, Long itemUid) {
 		
-		return (List<EadventureItemVisitLog>) getHibernateTemplate().find(FIND_BY_ITEM_BYSESSION,new Object[]{sessionId,itemUid});
+		return (List<EadventureItemVisitLog>) doFind(FIND_BY_ITEM_BYSESSION,new Object[]{sessionId,itemUid});
 	}
 
 }
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureParamDAOHibernate.java
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -rc70338ac317b645a997bda4c7d1252a5fee44f66
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureParamDAOHibernate.java	(.../EadventureParamDAOHibernate.java)	(revision 7322054ababd8f5387c3424cdd38d99c3ab49e02)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureParamDAOHibernate.java	(.../EadventureParamDAOHibernate.java)	(revision c70338ac317b645a997bda4c7d1252a5fee44f66)
@@ -27,9 +27,11 @@
 
 import org.eucm.lams.tool.eadventure.dao.EadventureParamDAO;
 import org.eucm.lams.tool.eadventure.model.EadventureParam;
-import org.eucm.lams.tool.eadventure.model.EadventureVars;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.springframework.stereotype.Repository;
  
-public class EadventureParamDAOHibernate extends BaseDAOHibernate implements EadventureParamDAO {
+@Repository
+public class EadventureParamDAOHibernate extends LAMSBaseDAO implements EadventureParamDAO {
 
     
     private static final String FIND_BY_PARAM_NAME= "from " + EadventureParam.class.getName()
@@ -41,7 +43,7 @@
 
     
     public List<EadventureParam> getEadventureParamByEadContentId(Long contentId){
-	List list = getHibernateTemplate().find(FIND_BY_EAD,contentId);
+	List list = doFind(FIND_BY_EAD,contentId);
 	if(list == null || list.size() ==0)
 		return null;
 	
@@ -50,13 +52,13 @@
 
     
     public void delete(EadventureParam param){
-	this.getHibernateTemplate().delete(param);
+    	getSession().delete(param);
     }
 
 	public String getEadventureParamTypeByNameAndEadContentID(String name,
 			Long contentId) {
 		
-		List list = getHibernateTemplate().find(FIND_BY_PARAM_NAME,new Object[]{contentId,name});
+		List list = doFind(FIND_BY_PARAM_NAME,new Object[]{contentId,name});
 		if(list == null || list.size() ==0)
 			return null;
 		
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureSessionDAOHibernate.java
===================================================================
diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rc70338ac317b645a997bda4c7d1252a5fee44f66
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureSessionDAOHibernate.java	(.../EadventureSessionDAOHibernate.java)	(revision 2aaccb954583cd8431759dca8e912a8fe863aa0e)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureSessionDAOHibernate.java	(.../EadventureSessionDAOHibernate.java)	(revision c70338ac317b645a997bda4c7d1252a5fee44f66)
@@ -27,26 +27,28 @@
 
 import org.eucm.lams.tool.eadventure.dao.EadventureSessionDAO;
 import org.eucm.lams.tool.eadventure.model.EadventureSession;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.springframework.stereotype.Repository;
 
-
-public class EadventureSessionDAOHibernate extends BaseDAOHibernate implements EadventureSessionDAO{
+@Repository
+public class EadventureSessionDAOHibernate extends LAMSBaseDAO implements EadventureSessionDAO{
 	
 	private static final String FIND_BY_SESSION_ID = "from " + EadventureSession.class.getName() + " as p where p.sessionId=?";
 	private static final String FIND_BY_CONTENT_ID = "from " + EadventureSession.class.getName() + " as p where p.eadventure.contentId=?";
 	
 	public EadventureSession getSessionBySessionId(Long sessionId) {
-		List list = getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId);
+		List list = doFind(FIND_BY_SESSION_ID,sessionId);
 		if(list == null || list.size() == 0)
 			return null;
 		return (EadventureSession) list.get(0);
 	}
 	@SuppressWarnings("unchecked")
 	public List<EadventureSession> getByContentId(Long toolContentId) {
-		return (List<EadventureSession>) getHibernateTemplate().find(FIND_BY_CONTENT_ID,toolContentId);
+		return (List<EadventureSession>) doFind(FIND_BY_CONTENT_ID,toolContentId);
 	}
 	
 	public void delete(EadventureSession session) {
-		this.getHibernateTemplate().delete(session);
+		getSession().delete(session);
 	}
 	public void deleteBySessionId(Long toolSessionId) {
 		this.removeObject(EadventureSession.class,toolSessionId);
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureUserDAOHibernate.java
===================================================================
diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -rc70338ac317b645a997bda4c7d1252a5fee44f66
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureUserDAOHibernate.java	(.../EadventureUserDAOHibernate.java)	(revision 2aaccb954583cd8431759dca8e912a8fe863aa0e)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureUserDAOHibernate.java	(.../EadventureUserDAOHibernate.java)	(revision c70338ac317b645a997bda4c7d1252a5fee44f66)
@@ -27,31 +27,33 @@
 
 import org.eucm.lams.tool.eadventure.dao.EadventureUserDAO;
 import org.eucm.lams.tool.eadventure.model.EadventureUser;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.springframework.stereotype.Repository;
 
-
-public class EadventureUserDAOHibernate extends BaseDAOHibernate implements EadventureUserDAO{
+@Repository
+public class EadventureUserDAOHibernate extends LAMSBaseDAO implements EadventureUserDAO{
 	
 	private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + EadventureUser.class.getName() + " as u where u.userId =? and u.eadventure.contentId=?";
 	private static final String FIND_BY_USER_ID_SESSION_ID = "from " + EadventureUser.class.getName() + " as u where u.userId =? and u.session.sessionId=?";
 	private static final String FIND_BY_SESSION_ID = "from " + EadventureUser.class.getName() + " as u where u.session.sessionId=?";
 
 	public EadventureUser getUserByUserIDAndSessionID(Long userID, Long sessionId) {
-		List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID,new Object[]{userID,sessionId});
+		List list = this.doFind(FIND_BY_USER_ID_SESSION_ID,new Object[]{userID,sessionId});
 		if(list == null || list.size() == 0)
 			return null;
 		return (EadventureUser) list.get(0);
 	}
 
 	public EadventureUser getUserByUserIDAndContentID(Long userId, Long contentId) {
-		List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID,new Object[]{userId,contentId});
+		List list = this.doFind(FIND_BY_USER_ID_CONTENT_ID,new Object[]{userId,contentId});
 		if(list == null || list.size() == 0)
 			return null;
 		return (EadventureUser) list.get(0);
 	}
 
 	@SuppressWarnings("unchecked")
 	public List<EadventureUser> getBySessionID(Long sessionId) {
-		return (List<EadventureUser>) this.getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId);
+		return (List<EadventureUser>) this.doFind(FIND_BY_SESSION_ID,sessionId);
 	}
 
 
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureVarsDAOHibernate.java
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -rc70338ac317b645a997bda4c7d1252a5fee44f66
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureVarsDAOHibernate.java	(.../EadventureVarsDAOHibernate.java)	(revision 7322054ababd8f5387c3424cdd38d99c3ab49e02)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureVarsDAOHibernate.java	(.../EadventureVarsDAOHibernate.java)	(revision c70338ac317b645a997bda4c7d1252a5fee44f66)
@@ -26,18 +26,20 @@
 import java.util.List;
 
 import org.eucm.lams.tool.eadventure.dao.EadventureVarsDAO;
-import org.eucm.lams.tool.eadventure.model.EadventureItemVisitLog;
 import org.eucm.lams.tool.eadventure.model.EadventureVars;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.springframework.stereotype.Repository;
  
-public class EadventureVarsDAOHibernate extends BaseDAOHibernate implements EadventureVarsDAO {
+@Repository
+public class EadventureVarsDAOHibernate extends LAMSBaseDAO implements EadventureVarsDAO {
 
     
     
     private static final String FIND_BY_ITEM_AND_NAME = "from " + EadventureVars.class.getName()
 	+ " as r where r.visitLog.uid = ? and r.name =?";
     
     public EadventureVars getEadventureVars(Long itemVisitLogID,String name){
-	List list = getHibernateTemplate().find(FIND_BY_ITEM_AND_NAME,new Object[]{itemVisitLogID,name});
+	List list = doFind(FIND_BY_ITEM_AND_NAME,new Object[]{itemVisitLogID,name});
 	if(list == null || list.size() ==0)
 		return null;