Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/common/dao
Modified Files:
DocumentResultsDao.java QueueDao.java OcanStaffFormDao.java
ConsultationServiceDao.java PopulationReportDao.java
TicklerLinkDAO.java QueueDocumentLinkDao.java
ConsultationRequestDao.java
Log Message:
changed all commons logging to log4j logging
Index: ConsultationServiceDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/ConsultationServiceDao.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConsultationServiceDao.java 12 Nov 2010 21:04:34 -0000 1.1
--- ConsultationServiceDao.java 15 Nov 2010 01:27:31 -0000 1.2
***************
*** 27,31 ****
import org.oscarehr.common.model.ConsultationServices;
-
import org.springframework.stereotype.Repository;
--- 27,30 ----
Index: OcanStaffFormDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/OcanStaffFormDao.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OcanStaffFormDao.java 9 Oct 2010 03:58:08 -0000 1.7
--- OcanStaffFormDao.java 15 Nov 2010 01:27:31 -0000 1.8
***************
*** 20,24 ****
package org.oscarehr.common.dao;
- import java.util.ArrayList;
import java.util.Date;
import java.util.List;
--- 20,23 ----
Index: TicklerLinkDAO.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/TicklerLinkDAO.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TicklerLinkDAO.java 9 Jul 2010 21:56:35 -0000 1.2
--- TicklerLinkDAO.java 15 Nov 2010 01:27:31 -0000 1.3
***************
*** 27,38 ****
import java.util.List;
! import org.apache.commons.logging.Log;
! import org.apache.commons.logging.LogFactory;
import org.oscarehr.common.model.TicklerLink;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
public class TicklerLinkDAO extends HibernateDaoSupport {
! private static Log log = LogFactory.getLog(TicklerLinkDAO.class);
public TicklerLink getTicklerLink(Long id) {
--- 27,38 ----
import java.util.List;
! import org.apache.log4j.Logger;
import org.oscarehr.common.model.TicklerLink;
+ import org.oscarehr.util.MiscUtils;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
public class TicklerLinkDAO extends HibernateDaoSupport {
! private static Logger log = MiscUtils.getLogger();
public TicklerLink getTicklerLink(Long id) {
Index: QueueDocumentLinkDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/QueueDocumentLinkDao.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** QueueDocumentLinkDao.java 6 Nov 2010 17:36:31 -0000 1.5
--- QueueDocumentLinkDao.java 15 Nov 2010 01:27:31 -0000 1.6
***************
*** 27,31 ****
import java.util.List;
- import org.oscarehr.common.model.Queue;
import org.oscarehr.common.model.QueueDocumentLink;
--- 27,30 ----
Index: PopulationReportDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/PopulationReportDao.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PopulationReportDao.java 8 Sep 2009 15:36:13 -0000 1.7
--- PopulationReportDao.java 15 Nov 2010 01:27:31 -0000 1.8
***************
*** 34,39 ****
import java.util.Map.Entry;
! import org.apache.commons.logging.Log;
! import org.apache.commons.logging.LogFactory;
import org.hibernate.HibernateException;
import org.joda.time.Days;
--- 34,38 ----
import java.util.Map.Entry;
! import org.apache.log4j.Logger;
import org.hibernate.HibernateException;
import org.joda.time.Days;
***************
*** 44,47 ****
--- 43,47 ----
import org.oscarehr.common.model.Stay;
import org.oscarehr.util.DbConnectionFilter;
+ import org.oscarehr.util.MiscUtils;
import org.oscarehr.util.EncounterUtil.EncounterType;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
***************
*** 54,58 ****
public static final int HIGH = 2;
! private static final Log LOG = LogFactory.getLog(PopulationReportDao.class);
private static final String HQL_CURRENT_POP_SIZE = "select count(distinct a.ClientId) from Admission a where " + "a.ProgramId in (select p.id from Program p where lower(p.programStatus) = 'active' and lower(p.type) = 'bed') and " + "a.ClientId in (select d.DemographicNo from Demographic d where lower(d.PatientStatus) = 'ac') and " + "a.DischargeDate is null";
--- 54,58 ----
public static final int HIGH = 2;
! private static final Logger logger = MiscUtils.getLogger();
private static final String HQL_CURRENT_POP_SIZE = "select count(distinct a.ClientId) from Admission a where " + "a.ProgramId in (select p.id from Program p where lower(p.programStatus) = 'active' and lower(p.type) = 'bed') and " + "a.ClientId in (select d.DemographicNo from Demographic d where lower(d.PatientStatus) = 'ac') and " + "a.DischargeDate is null";
***************
*** 104,108 ****
}
catch (IllegalArgumentException e) {
! LOG.error("client id: " + clientId);
}
}
--- 104,108 ----
}
catch (IllegalArgumentException e) {
! logger.error("client id: " + clientId);
}
}
Index: QueueDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/QueueDao.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** QueueDao.java 9 Nov 2010 21:38:15 -0000 1.8
--- QueueDao.java 15 Nov 2010 01:27:31 -0000 1.9
***************
*** 10,17 ****
import java.util.Hashtable;
import java.util.List;
import javax.persistence.Query;
! import org.springframework.stereotype.Repository;
import org.oscarehr.common.model.Queue;
import org.oscarehr.util.MiscUtils;
/**
--- 10,19 ----
import java.util.Hashtable;
import java.util.List;
+
import javax.persistence.Query;
!
import org.oscarehr.common.model.Queue;
import org.oscarehr.util.MiscUtils;
+ import org.springframework.stereotype.Repository;
/**
Index: ConsultationRequestDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/ConsultationRequestDao.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConsultationRequestDao.java 12 Nov 2010 21:03:59 -0000 1.2
--- ConsultationRequestDao.java 15 Nov 2010 01:27:31 -0000 1.3
***************
*** 31,38 ****
import org.apache.commons.lang.time.DateFormatUtils;
-
import org.oscarehr.common.model.ConsultationRequest;
- import org.oscarehr.common.model.Provider;
- import org.oscarehr.common.model.Demographic;
import org.springframework.stereotype.Repository;
--- 31,35 ----
Index: DocumentResultsDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/DocumentResultsDao.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DocumentResultsDao.java 6 Nov 2010 17:35:58 -0000 1.8
--- DocumentResultsDao.java 15 Nov 2010 01:27:31 -0000 1.9
***************
*** 12,16 ****
--- 12,18 ----
import java.util.ArrayList;
import java.util.List;
+
import javax.persistence.Query;
+
import org.apache.log4j.Logger;
import org.oscarehr.common.model.Demographic;
|