Fisheye: Tag 1.4.16.2 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/BaseDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceDAOHibernate.java,v diff -u -r1.6 -r1.6.16.1 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceDAOHibernate.java 17 Sep 2006 06:25:40 -0000 1.6 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceDAOHibernate.java 29 Nov 2014 21:39:04 -0000 1.6.16.1 @@ -25,20 +25,23 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.rsrc.dao.ResourceDAO; import org.lamsfoundation.lams.tool.rsrc.model.Resource; +import org.springframework.stereotype.Repository; /** * * @author Steve.Ni * * @version $Revision$ */ -public class ResourceDAOHibernate extends BaseDAOHibernate implements ResourceDAO{ +@Repository +public class ResourceDAOHibernate extends LAMSBaseDAO implements ResourceDAO{ private static final String GET_RESOURCE_BY_CONTENTID = "from "+Resource.class.getName()+" as r where r.contentId=?"; public Resource 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 (Resource) list.get(0); else @@ -50,7 +53,7 @@ } public void delete(Resource resource) { - this.getHibernateTemplate().delete(resource); + getSession().delete(resource); } } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemDAOHibernate.java,v diff -u -r1.5 -r1.5.16.1 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemDAOHibernate.java 17 Sep 2006 06:25:40 -0000 1.5 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemDAOHibernate.java 29 Nov 2014 21:39:04 -0000 1.5.16.1 @@ -25,16 +25,19 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.rsrc.dao.ResourceItemDAO; import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem; +import org.springframework.stereotype.Repository; -public class ResourceItemDAOHibernate extends BaseDAOHibernate implements ResourceItemDAO{ +@Repository +public class ResourceItemDAOHibernate extends LAMSBaseDAO implements ResourceItemDAO{ private static final String FIND_AUTHORING_ITEMS = "from " + ResourceItem.class.getName() + " where resource_uid = ? order by create_date asc"; public List getAuthoringItems(Long resourceUid) { - return this.getHibernateTemplate().find(FIND_AUTHORING_ITEMS,resourceUid); + return this.doFind(FIND_AUTHORING_ITEMS,resourceUid); } public ResourceItem getByUid(Long resourceItemUid) { Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java,v diff -u -r1.11.2.1 -r1.11.2.2 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java 15 Aug 2014 09:30:47 -0000 1.11.2.1 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java 29 Nov 2014 21:39:04 -0000 1.11.2.2 @@ -27,12 +27,15 @@ import java.util.List; import java.util.Map; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.rsrc.dao.ResourceItemVisitDAO; import org.lamsfoundation.lams.tool.rsrc.model.Resource; import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemVisitLog; import org.lamsfoundation.lams.tool.rsrc.model.ResourceSession; +import org.springframework.stereotype.Repository; -public class ResourceItemVisitDAOHibernate extends BaseDAOHibernate implements ResourceItemVisitDAO{ +@Repository +public class ResourceItemVisitDAOHibernate extends LAMSBaseDAO implements ResourceItemVisitDAO{ private static final String FIND_BY_ITEM_AND_USER = "from " + ResourceItemVisitLog.class.getName() + " as r where r.user.userId = ? and r.resourceItem.uid=?"; @@ -53,14 +56,14 @@ +" group by v.sessionId, v.resourceItem.uid "; public ResourceItemVisitLog getResourceItemLog(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 (ResourceItemVisitLog) 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(); @@ -70,7 +73,7 @@ public Map getSummary(Long contentId) { // Note: Hibernate 3.1 query.uniqueResult() returns Integer, Hibernate 3.2 query.uniqueResult() returns Long - List result = (List) getHibernateTemplate().find(FIND_SUMMARY,contentId); + List result = (List) doFind(FIND_SUMMARY,contentId); Map summaryList = new HashMap (result.size()); for(Object[] list : result){ if ( list[1] != null ) { @@ -84,7 +87,7 @@ @SuppressWarnings("unchecked") public List getResourceItemLogBySession(Long sessionId, Long itemUid) { - return (List) getHibernateTemplate().find(FIND_BY_ITEM_BYSESSION,new Object[]{sessionId,itemUid}); + return (List) doFind(FIND_BY_ITEM_BYSESSION,new Object[]{sessionId,itemUid}); } } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java,v diff -u -r1.7.16.1 -r1.7.16.2 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java 15 Aug 2014 09:30:47 -0000 1.7.16.1 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java 29 Nov 2014 21:39:04 -0000 1.7.16.2 @@ -25,28 +25,30 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.rsrc.dao.ResourceSessionDAO; import org.lamsfoundation.lams.tool.rsrc.model.ResourceSession; +import org.springframework.stereotype.Repository; - -public class ResourceSessionDAOHibernate extends BaseDAOHibernate implements ResourceSessionDAO{ +@Repository +public class ResourceSessionDAOHibernate extends LAMSBaseDAO implements ResourceSessionDAO{ private static final String FIND_BY_SESSION_ID = "from " + ResourceSession.class.getName() + " as p where p.sessionId=?"; private static final String FIND_BY_CONTENT_ID = "from " + ResourceSession.class.getName() + " as p where p.resource.contentId=?"; public ResourceSession 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 (ResourceSession) list.get(0); } @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { - return (List) getHibernateTemplate().find(FIND_BY_CONTENT_ID,toolContentId); + return (List) doFind(FIND_BY_CONTENT_ID,toolContentId); } public void delete(ResourceSession session) { - this.getHibernateTemplate().delete(session); + getSession().delete(session); } public void deleteBySessionId(Long toolSessionId) { this.removeObject(ResourceSession.class,toolSessionId); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java,v diff -u -r1.9.16.1 -r1.9.16.2 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java 15 Aug 2014 09:30:47 -0000 1.9.16.1 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java 29 Nov 2014 21:39:04 -0000 1.9.16.2 @@ -25,33 +25,35 @@ import java.util.List; +import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.rsrc.dao.ResourceUserDAO; import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser; +import org.springframework.stereotype.Repository; - -public class ResourceUserDAOHibernate extends BaseDAOHibernate implements ResourceUserDAO{ +@Repository +public class ResourceUserDAOHibernate extends LAMSBaseDAO implements ResourceUserDAO{ private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + ResourceUser.class.getName() + " as u where u.userId =? and u.resource.contentId=?"; private static final String FIND_BY_USER_ID_SESSION_ID = "from " + ResourceUser.class.getName() + " as u where u.userId =? and u.session.sessionId=?"; private static final String FIND_BY_SESSION_ID = "from " + ResourceUser.class.getName() + " as u where u.session.sessionId=?"; public ResourceUser 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 (ResourceUser) list.get(0); } public ResourceUser 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 (ResourceUser) list.get(0); } @SuppressWarnings("unchecked") public List getBySessionID(Long sessionId) { - return (List) this.getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId); + return (List) this.doFind(FIND_BY_SESSION_ID,sessionId); }