You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(95) |
Dec
(207) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(106) |
Feb
(69) |
Mar
(78) |
Apr
(65) |
May
(118) |
Jun
(121) |
Jul
(190) |
Aug
(95) |
Sep
(160) |
Oct
(114) |
Nov
(85) |
Dec
(79) |
| 2006 |
Jan
(103) |
Feb
(89) |
Mar
(41) |
Apr
(122) |
May
(94) |
Jun
(62) |
Jul
(491) |
Aug
(95) |
Sep
(279) |
Oct
(167) |
Nov
(156) |
Dec
(624) |
| 2007 |
Jan
(364) |
Feb
(271) |
Mar
(315) |
Apr
(378) |
May
(193) |
Jun
(235) |
Jul
(548) |
Aug
(388) |
Sep
(725) |
Oct
(369) |
Nov
(322) |
Dec
(487) |
| 2008 |
Jan
(552) |
Feb
(628) |
Mar
(817) |
Apr
(746) |
May
(1224) |
Jun
(1971) |
Jul
(1191) |
Aug
(876) |
Sep
(491) |
Oct
(267) |
Nov
(354) |
Dec
(747) |
| 2009 |
Jan
(322) |
Feb
(442) |
Mar
(573) |
Apr
(303) |
May
(401) |
Jun
(340) |
Jul
(403) |
Aug
(238) |
Sep
(267) |
Oct
(347) |
Nov
(456) |
Dec
(184) |
| 2010 |
Jan
(246) |
Feb
(432) |
Mar
(598) |
Apr
(250) |
May
(498) |
Jun
(715) |
Jul
(1282) |
Aug
(350) |
Sep
(504) |
Oct
(632) |
Nov
(870) |
Dec
(170) |
| 2011 |
Jan
(206) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:11
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/util In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarRx/util Modified Files: RxUtil.java LimitedUseLookup.java Log Message: changed all commons logging to log4j logging Index: LimitedUseLookup.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/util/LimitedUseLookup.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LimitedUseLookup.java 9 Jul 2010 21:56:37 -0000 1.4 --- LimitedUseLookup.java 15 Nov 2010 01:27:32 -0000 1.5 *************** *** 35,40 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.jdom.Document; import org.jdom.Element; --- 35,39 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.jdom.Document; import org.jdom.Element; *************** *** 49,53 **** public class LimitedUseLookup { ! private static Log log = LogFactory.getLog(LimitedUseLookup.class); static Hashtable<String, ArrayList> luLookup = new Hashtable(); --- 48,52 ---- public class LimitedUseLookup { ! private static Logger log = MiscUtils.getLogger(); static Hashtable<String, ArrayList> luLookup = new Hashtable(); Index: RxUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/util/RxUtil.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** RxUtil.java 12 Nov 2010 20:27:44 -0000 1.45 --- RxUtil.java 15 Nov 2010 01:27:32 -0000 1.46 *************** *** 44,49 **** import org.apache.commons.lang.StringEscapeUtils; - import org.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcClientLite; --- 44,47 ---- *************** *** 1714,1718 **** } ! private static Log log2 = LogFactory.getLog(RxMyDrugrefInfoAction.class); public static Object callWebserviceLite(String procedureName, Vector params) throws Exception{ log2.debug("#CALLmyDRUGREF-"+procedureName); --- 1712,1716 ---- } ! private static final Logger log2 = MiscUtils.getLogger(); public static Object callWebserviceLite(String procedureName, Vector params) throws Exception{ log2.debug("#CALLmyDRUGREF-"+procedureName); |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:11
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/caisi/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/caisi/dao Modified Files: IssueAdminDAO.java Log Message: changed all commons logging to log4j logging Index: IssueAdminDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/caisi/dao/IssueAdminDAO.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IssueAdminDAO.java 26 Sep 2007 20:04:41 -0000 1.3 --- IssueAdminDAO.java 15 Nov 2010 01:27:33 -0000 1.4 *************** *** 25,35 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.caisi.model.IssueAdmin; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class IssueAdminDAO extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(IssueAdminDAO.class); public List getIssueAdmins() { --- 25,35 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.caisi.model.IssueAdmin; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class IssueAdminDAO extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); public List getIssueAdmins() { |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:11
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarDemographic/data Modified Files: DemographicData.java DemographicMerged.java DemographicExt.java Log Message: changed all commons logging to log4j logging Index: DemographicMerged.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/data/DemographicMerged.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** DemographicMerged.java 6 Oct 2010 21:52:10 -0000 1.11 --- DemographicMerged.java 15 Nov 2010 01:27:33 -0000 1.12 *************** *** 19,23 **** import org.oscarehr.util.DbConnectionFilter; - import oscar.oscarDB.DBHandler; import oscar.util.UtilDateUtilities; --- 19,22 ---- Index: DemographicData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/data/DemographicData.java,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** DemographicData.java 11 Nov 2010 01:35:14 -0000 1.49 --- DemographicData.java 15 Nov 2010 01:27:33 -0000 1.50 *************** *** 35,40 **** import org.apache.commons.lang.StringUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.DbConnectionFilter; import org.oscarehr.util.MiscUtils; --- 35,39 ---- import org.apache.commons.lang.StringUtils; ! import org.apache.log4j.Logger; import org.oscarehr.util.DbConnectionFilter; import org.oscarehr.util.MiscUtils; *************** *** 44,48 **** public class DemographicData { ! private static Log _log = LogFactory.getLog(DemographicData.class); public DemographicData() { --- 43,47 ---- public class DemographicData { ! private static final Logger logger = MiscUtils.getLogger(); public DemographicData() { *************** *** 51,55 **** public String getDemographicFirstLastName(String demographicNo) { String fullName = ""; ! _log.debug("test"); MiscUtils.getLogger().debug("test"); try { --- 50,54 ---- public String getDemographicFirstLastName(String demographicNo) { String fullName = ""; ! logger.debug("test"); MiscUtils.getLogger().debug("test"); try { *************** *** 67,71 **** } catch (SQLException sqe) { ! _log.error("Could not get demographic first/last name", sqe); } return fullName; --- 66,70 ---- } catch (SQLException sqe) { ! logger.error("Could not get demographic first/last name", sqe); } return fullName; Index: DemographicExt.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/data/DemographicExt.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** DemographicExt.java 6 Oct 2010 21:52:10 -0000 1.14 --- DemographicExt.java 15 Nov 2010 01:27:33 -0000 1.15 *************** *** 62,67 **** import org.oscarehr.util.MiscUtils; - import oscar.oscarDB.DBHandler; - /** * This class is used to interface with the DemographicExt table. --- 62,65 ---- |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/decisionSupport/model In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/decisionSupport/model Modified Files: DSGuideline.java DSDemographicAccess.java DSCondition.java DSGuidelineFactory.java Log Message: changed all commons logging to log4j logging Index: DSGuidelineFactory.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/decisionSupport/model/DSGuidelineFactory.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DSGuidelineFactory.java 18 Oct 2010 14:39:23 -0000 1.5 --- DSGuidelineFactory.java 15 Nov 2010 01:27:33 -0000 1.6 *************** *** 6,11 **** package org.oscarehr.decisionSupport.model; - import org.oscarehr.decisionSupport.model.conditionValue.DSValue; - import org.oscarehr.decisionSupport.model.impl.drools.DSGuidelineDrools; import java.io.IOException; import java.io.StringReader; --- 6,9 ---- *************** *** 13,17 **** --- 11,17 ---- import java.util.Hashtable; import java.util.List; + import org.apache.commons.lang.StringUtils; + import org.apache.log4j.Logger; import org.jdom.Attribute; import org.jdom.Document; *************** *** 19,24 **** import org.jdom.JDOMException; import org.jdom.input.SAXBuilder; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; /** * --- 19,25 ---- import org.jdom.JDOMException; import org.jdom.input.SAXBuilder; ! import org.oscarehr.decisionSupport.model.conditionValue.DSValue; ! import org.oscarehr.decisionSupport.model.impl.drools.DSGuidelineDrools; ! import org.oscarehr.util.MiscUtils; /** * *************** *** 26,30 **** */ public class DSGuidelineFactory { ! protected static Log _log = LogFactory.getLog(DSGuidelineFactory.class); public DSGuideline createGuidelineFromXml(String xml) throws DecisionSupportParseException { if (xml == null || xml.equals("")) throw new DecisionSupportParseException("Xml not set"); --- 27,31 ---- */ public class DSGuidelineFactory { ! private static Logger _log = MiscUtils.getLogger(); public DSGuideline createGuidelineFromXml(String xml) throws DecisionSupportParseException { if (xml == null || xml.equals("")) throw new DecisionSupportParseException("Xml not set"); Index: DSCondition.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/decisionSupport/model/DSCondition.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DSCondition.java 12 Mar 2010 18:59:57 -0000 1.3 --- DSCondition.java 15 Nov 2010 01:27:33 -0000 1.4 *************** *** 7,15 **** import java.util.Hashtable; - import org.oscarehr.decisionSupport.model.conditionValue.DSValue; import java.util.List; import org.apache.commons.lang.StringUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; /** --- 7,16 ---- import java.util.Hashtable; import java.util.List; + import org.apache.commons.lang.StringUtils; ! import org.apache.log4j.Logger; ! import org.oscarehr.decisionSupport.model.conditionValue.DSValue; ! import org.oscarehr.util.MiscUtils; /** *************** *** 18,22 **** */ public class DSCondition { ! private static final Log _log = LogFactory.getLog(DSCondition.class); /** --- 19,23 ---- */ public class DSCondition { ! private static final Logger _log = MiscUtils.getLogger(); /** Index: DSDemographicAccess.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/decisionSupport/model/DSDemographicAccess.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DSDemographicAccess.java 18 Oct 2010 18:40:17 -0000 1.8 --- DSDemographicAccess.java 15 Nov 2010 01:27:33 -0000 1.9 *************** *** 7,21 **** import java.util.ArrayList; - import org.oscarehr.decisionSupport.model.conditionValue.DSValue; import java.util.Arrays; import java.util.Hashtable; import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.billing.CA.ON.dao.BillingClaimDAO; import org.oscarehr.casemgmt.dao.CaseManagementNoteDAO; import org.oscarehr.casemgmt.model.CaseManagementNote; ! import org.oscarehr.decisionSupport.web.DSGuidelineAction; import org.oscarehr.util.SpringUtils; import oscar.oscarBilling.ca.bc.MSP.ServiceCodeValidationLogic; import oscar.oscarDemographic.data.DemographicData; --- 7,23 ---- import java.util.ArrayList; import java.util.Arrays; import java.util.Hashtable; import java.util.List; ! ! import org.apache.log4j.Logger; import org.oscarehr.billing.CA.ON.dao.BillingClaimDAO; import org.oscarehr.casemgmt.dao.CaseManagementNoteDAO; import org.oscarehr.casemgmt.model.CaseManagementNote; ! import org.oscarehr.decisionSupport.model.conditionValue.DSValue; ! import org.oscarehr.util.MiscUtils; import org.oscarehr.util.SpringUtils; + + import oscar.OscarProperties; import oscar.oscarBilling.ca.bc.MSP.ServiceCodeValidationLogic; import oscar.oscarDemographic.data.DemographicData; *************** *** 24,28 **** import oscar.oscarRx.data.RxPrescriptionData; import oscar.oscarRx.data.RxPrescriptionData.Prescription; - import oscar.OscarProperties; /** --- 26,29 ---- *************** *** 31,35 **** */ public class DSDemographicAccess { ! private static Log _log = LogFactory.getLog(DSGuidelineAction.class); //To add new modules/types, add to enum with the access method, add the appropriate --- 32,36 ---- */ public class DSDemographicAccess { ! private static final Logger logger = MiscUtils.getLogger(); //To add new modules/types, add to enum with the access method, add the appropriate *************** *** 81,85 **** public boolean hasDxCode(String codeType, String code) { ! _log.debug("HAS DX CODES CALLED"); List<dxResearchBean> dxCodes = this.getDxCodes(); for (dxResearchBean dxCode: dxCodes) { --- 82,86 ---- public boolean hasDxCode(String codeType, String code) { ! logger.debug("HAS DX CODES CALLED"); List<dxResearchBean> dxCodes = this.getDxCodes(); for (dxResearchBean dxCode: dxCodes) { *************** *** 118,122 **** public List<Prescription> getRxCodes() throws DecisionSupportException { ! _log.debug("GET RX CODES CALLED"); try { Prescription[] prescriptions = new RxPrescriptionData().getPrescriptionsByPatientHideDeleted(Integer.parseInt(this.demographicNo)); --- 119,123 ---- public List<Prescription> getRxCodes() throws DecisionSupportException { ! logger.debug("GET RX CODES CALLED"); try { Prescription[] prescriptions = new RxPrescriptionData().getPrescriptionsByPatientHideDeleted(Integer.parseInt(this.demographicNo)); *************** *** 124,128 **** return prescribedDrugs; } catch (NumberFormatException nfe) { ! _log.error("Decision Support Exception, could not format demographicNo: " + demographicNo); } return new ArrayList(); --- 125,129 ---- return prescribedDrugs; } catch (NumberFormatException nfe) { ! logger.error("Decision Support Exception, could not format demographicNo: " + demographicNo); } return new ArrayList(); *************** *** 189,193 **** public boolean isAge(DSValue statement) throws DecisionSupportException { ! _log.debug("IS AGE CALLED"); String compareAge = getDemographicData().getAgeInYears() + ""; if (statement.getValueUnit() != null) { --- 190,194 ---- public boolean isAge(DSValue statement) throws DecisionSupportException { ! logger.debug("IS AGE CALLED"); String compareAge = getDemographicData().getAgeInYears() + ""; if (statement.getValueUnit() != null) { *************** *** 236,240 **** public boolean isSex(DSValue sexStatement) throws DecisionSupportException { ! _log.debug("IS SEX CALLED"); if (sexStatement.getValue().equalsIgnoreCase("male")) sexStatement.setValue("M"); else if (sexStatement.getValue().equalsIgnoreCase("female")) sexStatement.setValue("F"); --- 237,241 ---- public boolean isSex(DSValue sexStatement) throws DecisionSupportException { ! logger.debug("IS SEX CALLED"); if (sexStatement.getValue().equalsIgnoreCase("male")) sexStatement.setValue("M"); else if (sexStatement.getValue().equalsIgnoreCase("female")) sexStatement.setValue("F"); *************** *** 271,275 **** ! public boolean noteContains(DSValue searchValue) throws DecisionSupportException { CaseManagementNoteDAO dao = (CaseManagementNoteDAO) SpringUtils.getBean("CaseManagementNoteDAO"); List<CaseManagementNote> notes = dao.searchDemographicNotes(demographicNo, "%" + searchValue.getValue() + "%"); --- 272,276 ---- ! public boolean noteContains(DSValue searchValue) { CaseManagementNoteDAO dao = (CaseManagementNoteDAO) SpringUtils.getBean("CaseManagementNoteDAO"); List<CaseManagementNote> notes = dao.searchDemographicNotes(demographicNo, "%" + searchValue.getValue() + "%"); *************** *** 278,282 **** } ! public boolean noteContainsAny(String searchStrings) throws DecisionSupportException { List<DSValue> searchValues = DSValue.createDSValues(searchStrings); for (DSValue searchValue: searchValues) { --- 279,283 ---- } ! public boolean noteContainsAny(String searchStrings) { List<DSValue> searchValues = DSValue.createDSValues(searchStrings); for (DSValue searchValue: searchValues) { *************** *** 286,290 **** } ! public boolean noteContainsAll(String searchStrings) throws DecisionSupportException { List<DSValue> searchValues = DSValue.createDSValues(searchStrings); for (DSValue searchValue: searchValues) { --- 287,291 ---- } ! public boolean noteContainsAll(String searchStrings) { List<DSValue> searchValues = DSValue.createDSValues(searchStrings); for (DSValue searchValue: searchValues) { *************** *** 296,302 **** public boolean noteContainsNot(String searchStrings) throws DecisionSupportException { return noteContainsNotany(searchStrings); } ! public boolean noteContainsNotall(String searchStrings) throws DecisionSupportException { return !noteContainsAll(searchStrings); } ! public boolean noteContainsNotany(String searchStrings) throws DecisionSupportException { return !noteContainsAny(searchStrings); } --- 297,303 ---- public boolean noteContainsNot(String searchStrings) throws DecisionSupportException { return noteContainsNotany(searchStrings); } ! public boolean noteContainsNotall(String searchStrings) { return !noteContainsAll(searchStrings); } ! public boolean noteContainsNotany(String searchStrings) { return !noteContainsAny(searchStrings); } *************** *** 316,320 **** boolean retval = false; if(options.containsKey("payer") && options.get("payer").equals("MSP")){ ! _log.debug("PAYER:MSP "); ServiceCodeValidationLogic bcCodeValidation = null; BillingClaimDAO billingClaimONDAO = null; --- 317,321 ---- boolean retval = false; if(options.containsKey("payer") && options.get("payer").equals("MSP")){ ! logger.debug("PAYER:MSP "); ServiceCodeValidationLogic bcCodeValidation = null; BillingClaimDAO billingClaimONDAO = null; *************** *** 355,359 **** retval = false; // should it just return false here, why go on once it finds a false? } ! _log.debug("PAYER:MSP demo "+demographicNo+" Code:"+code+" numDays"+numDays+" notInDays:"+notInDays+ " Answer: "+!(numDays < notInDays && numDays != -1)+" Setting return val to :"+retval); } --- 356,360 ---- retval = false; // should it just return false here, why go on once it finds a false? } ! logger.debug("PAYER:MSP demo "+demographicNo+" Code:"+code+" numDays"+numDays+" notInDays:"+notInDays+ " Answer: "+!(numDays < notInDays && numDays != -1)+" Setting return val to :"+retval); } *************** *** 362,366 **** } ! _log.debug("In Billed For Any look for "+searchStrings+" returning :"+retval); return retval; } --- 363,367 ---- } ! logger.debug("In Billed For Any look for "+searchStrings+" returning :"+retval); return retval; } *************** *** 388,392 **** } ! _log.debug("In Billed For Any look for "+searchStrings); return retval; } --- 389,393 ---- } ! logger.debug("In Billed For Any look for "+searchStrings); return retval; } *************** *** 429,436 **** if (module == Module.notes) return ""; } catch (Exception dse) { ! _log.error("Cannot get demographic data for decision support, module: '" + module + "'", dse); return null; } ! _log.error("Decision Support Display Error: Cannot get text for module: " + module); return null; } --- 430,437 ---- if (module == Module.notes) return ""; } catch (Exception dse) { ! logger.error("Cannot get demographic data for decision support, module: '" + module + "'", dse); return null; } ! logger.error("Decision Support Display Error: Cannot get text for module: " + module); return null; } Index: DSGuideline.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/decisionSupport/model/DSGuideline.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DSGuideline.java 18 Oct 2010 14:38:36 -0000 1.2 --- DSGuideline.java 15 Nov 2010 01:27:33 -0000 1.3 *************** *** 9,15 **** import java.util.Date; import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.jdom.JDOMException; /** --- 9,16 ---- import java.util.Date; import java.util.List; ! ! import org.apache.log4j.Logger; import org.jdom.JDOMException; + import org.oscarehr.util.MiscUtils; /** *************** *** 29,33 **** }*/ ! protected static Log _log = LogFactory.getLog(DSGuideline.class); protected int id; protected String uuid; --- 30,34 ---- }*/ ! private static Logger _log = MiscUtils.getLogger(); protected int id; protected String uuid; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/dao Modified Files: OscarSuperDao.java Log Message: changed all commons logging to log4j logging Index: OscarSuperDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dao/OscarSuperDao.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OscarSuperDao.java 5 Sep 2010 07:05:24 -0000 1.5 --- OscarSuperDao.java 15 Nov 2010 01:27:32 -0000 1.6 *************** *** 4,26 **** import java.util.Map; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.support.JdbcDaoSupport; - - /** ! * Oscar super DAO implementation created to extract database access code from ! * JSP files. This class should be extended by a scope named DAO class, i.e. ! * AppointmentDao. Do not access methods of this class directly - use ! * OscarSuperManager methods instead. * * @author Eugene Petruhin - * */ public abstract class OscarSuperDao extends JdbcDaoSupport { ! private static final Log _log = LogFactory.getLog(OscarSuperDao.class); protected abstract String[][] getDbQueries(); --- 4,20 ---- import java.util.Map; ! import org.apache.log4j.Logger; ! import org.oscarehr.util.MiscUtils; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.support.JdbcDaoSupport; /** ! * Oscar super DAO implementation created to extract database access code from JSP files. This class should be extended by a scope named DAO class, i.e. AppointmentDao. Do not access methods of this class directly - use OscarSuperManager methods instead. * * @author Eugene Petruhin */ public abstract class OscarSuperDao extends JdbcDaoSupport { ! private static final Logger logger = MiscUtils.getLogger(); protected abstract String[][] getDbQueries(); *************** *** 32,39 **** * Returned collection item is an automatically populated Map. * ! * @param queryName ! * sql query key ! * @param params ! * sql query parameters * @return List of Map objects created for each result set row */ --- 26,31 ---- * Returned collection item is an automatically populated Map. * ! * @param queryName sql query key ! * @param params sql query parameters * @return List of Map objects created for each result set row */ *************** *** 45,57 **** /** * Executes a parameterized select query identified by a key.<br> ! * Returned collection item is a value object populated by a row mapper ! * identified by the same key. * ! * @param queryName ! * sql query key ! * @param params ! * sql query parameters ! * @return List of value objects created for each result set row by a row ! * mapper */ @SuppressWarnings("unchecked") --- 37,45 ---- /** * Executes a parameterized select query identified by a key.<br> ! * Returned collection item is a value object populated by a row mapper identified by the same key. * ! * @param queryName sql query key ! * @param params sql query parameters ! * @return List of value objects created for each result set row by a row mapper */ @SuppressWarnings("unchecked") *************** *** 63,70 **** * Executes a parameterized insert/update/delete query identified by a key.<br> * ! * @param queryName ! * sql query key ! * @param params ! * sql query parameters * @return number of affected rows */ --- 51,56 ---- * Executes a parameterized insert/update/delete query identified by a key.<br> * ! * @param queryName sql query key ! * @param params sql query parameters * @return number of affected rows */ *************** *** 76,85 **** * Retrieves a sql query associated with a query name or reports an error. * ! * @param key ! * query name * @return sql query */ private String getSqlQueryByKey(String key) { ! _log.debug("Calling query "+key); for (String[] query : getDbQueries()) { if (query[0].equals(key)) { --- 62,70 ---- * Retrieves a sql query associated with a query name or reports an error. * ! * @param key query name * @return sql query */ private String getSqlQueryByKey(String key) { ! logger.debug("Calling query " + key); for (String[] query : getDbQueries()) { if (query[0].equals(key)) { *************** *** 93,98 **** * Retrieves a row mapper associated with a query name or reports an error. * ! * @param key ! * query name * @return row mapper */ --- 78,82 ---- * Retrieves a row mapper associated with a query name or reports an error. * ! * @param key query name * @return row mapper */ |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil Modified Files: BillingCreateBillingForm.java BillingViewAction.java BillingUpdateBillingAction.java BillingReProcessBillAction.java BillingAction.java BillingCreateBillingAction.java ManageTeleplanAction.java BillingSaveBillingAction.java Log Message: changed all commons logging to log4j logging Index: BillingCreateBillingAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil/BillingCreateBillingAction.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** BillingCreateBillingAction.java 19 Jul 2010 18:21:27 -0000 1.44 --- BillingCreateBillingAction.java 15 Nov 2010 01:27:31 -0000 1.45 *************** *** 37,42 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; --- 37,41 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; *************** *** 63,67 **** public class BillingCreateBillingAction extends Action { ! private static final Log log = LogFactory.getLog(BillingCreateBillingAction.class); private ServiceCodeValidationLogic vldt = new ServiceCodeValidationLogic(); --- 62,66 ---- public class BillingCreateBillingAction extends Action { ! private static final Logger log=MiscUtils.getLogger(); private ServiceCodeValidationLogic vldt = new ServiceCodeValidationLogic(); Index: ManageTeleplanAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil/ManageTeleplanAction.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ManageTeleplanAction.java 11 Nov 2010 01:35:11 -0000 1.20 --- ManageTeleplanAction.java 15 Nov 2010 01:27:31 -0000 1.21 *************** *** 42,47 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 42,46 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 50,53 **** --- 49,53 ---- import org.oscarehr.common.dao.DemographicDao; import org.oscarehr.common.model.Demographic; + import org.oscarehr.util.MiscUtils; import org.oscarehr.util.SpringUtils; *************** *** 73,77 **** public class ManageTeleplanAction extends DispatchAction { ! private static Log log = LogFactory.getLog(ManageTeleplanAction.class); /** Creates a new instance of ManageTeleplanAction */ --- 73,77 ---- public class ManageTeleplanAction extends DispatchAction { ! private static Logger log = MiscUtils.getLogger(); /** Creates a new instance of ManageTeleplanAction */ Index: BillingUpdateBillingAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil/BillingUpdateBillingAction.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** BillingUpdateBillingAction.java 9 Jul 2010 21:56:38 -0000 1.12 --- BillingUpdateBillingAction.java 15 Nov 2010 01:27:31 -0000 1.13 *************** *** 38,43 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; --- 38,42 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; *************** *** 56,60 **** public final class BillingUpdateBillingAction extends Action { ! private static Log log = LogFactory.getLog(BillingUpdateBillingAction.class); HttpServletRequest request; public ActionForward execute(ActionMapping mapping, --- 55,59 ---- public final class BillingUpdateBillingAction extends Action { ! private static Logger log = MiscUtils.getLogger(); HttpServletRequest request; public ActionForward execute(ActionMapping mapping, Index: BillingSaveBillingAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil/BillingSaveBillingAction.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** BillingSaveBillingAction.java 11 Nov 2010 01:35:11 -0000 1.47 --- BillingSaveBillingAction.java 15 Nov 2010 01:27:31 -0000 1.48 *************** *** 36,41 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; --- 36,40 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; *************** *** 61,65 **** public class BillingSaveBillingAction extends Action { ! private static Log log = LogFactory.getLog(BillingSaveBillingAction.class); public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { --- 60,64 ---- public class BillingSaveBillingAction extends Action { ! private static Logger log = MiscUtils.getLogger(); public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { Index: BillingReProcessBillAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil/BillingReProcessBillAction.java,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** BillingReProcessBillAction.java 6 Oct 2010 08:03:19 -0000 1.46 --- BillingReProcessBillAction.java 15 Nov 2010 01:27:31 -0000 1.47 *************** *** 35,40 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; --- 35,39 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; *************** *** 61,65 **** public class BillingReProcessBillAction extends Action { ! private static Log _log = LogFactory.getLog(BillingReProcessBillAction.class); //Misc misc = new Misc(); --- 60,64 ---- public class BillingReProcessBillAction extends Action { ! private static final Logger logger = MiscUtils.getLogger(); //Misc misc = new Misc(); *************** *** 82,91 **** WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext()); BillingmasterDAO billingmasterDAO = (BillingmasterDAO) ctx.getBean("BillingmasterDAO"); ! _log.debug("RETRIEVING Using "+billingmasterNo); Billingmaster billingmaster = billingmasterDAO.getBillingMasterByBillingMasterNo(billingmasterNo); Billing bill = billingmasterDAO.getBilling(billingmaster.getBillingNo()); ! _log.debug("type "+bill.getBillingtype()); --- 81,90 ---- WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext()); BillingmasterDAO billingmasterDAO = (BillingmasterDAO) ctx.getBean("BillingmasterDAO"); ! logger.debug("RETRIEVING Using "+billingmasterNo); Billingmaster billingmaster = billingmasterDAO.getBillingMasterByBillingMasterNo(billingmasterNo); Billing bill = billingmasterDAO.getBilling(billingmaster.getBillingNo()); ! logger.debug("type "+bill.getBillingtype()); *************** *** 243,247 **** //BillingService billingService = bcd.getBillingCodeByCode(billingServiceCode, new Date()); String codePrice = request.getParameter("billingAmount"); //billingService.getValue(); ! _log.debug("codePrice=" + codePrice+" amount on form "+request.getParameter("billingAmount")); if("E".equals(payment_mode)){ --- 242,246 ---- //BillingService billingService = bcd.getBillingCodeByCode(billingServiceCode, new Date()); String codePrice = request.getParameter("billingAmount"); //billingService.getValue(); ! logger.debug("codePrice=" + codePrice+" amount on form "+request.getParameter("billingAmount")); if("E".equals(payment_mode)){ *************** *** 316,325 **** }catch(Exception e){} bill.setProviderNo(providerNo); ! _log.debug("WHAT IS BILL <ASTER "+billingmaster.getBillingmasterNo()); billingmasterDAO.update(billingmaster); billingmasterDAO.update(bill); ! _log.debug("type 2"+bill.getBillingtype()); ! _log.debug("WHAT IS BILL <ASTER2 "+billingmaster.getBillingmasterNo()); try { --- 315,324 ---- }catch(Exception e){} bill.setProviderNo(providerNo); ! logger.debug("WHAT IS BILL <ASTER "+billingmaster.getBillingmasterNo()); billingmasterDAO.update(billingmaster); billingmasterDAO.update(bill); ! logger.debug("type 2"+bill.getBillingtype()); ! logger.debug("WHAT IS BILL <ASTER2 "+billingmaster.getBillingmasterNo()); try { *************** *** 345,349 **** } if (secondSQL != null) { ! _log.debug(secondSQL); DBHandler.RunSQL(secondSQL); } --- 344,348 ---- } if (secondSQL != null) { ! logger.debug(secondSQL); DBHandler.RunSQL(secondSQL); } *************** *** 362,366 **** } catch (SQLException e3) { ! _log.info(e3.getMessage()); } --- 361,365 ---- } catch (SQLException e3) { ! logger.info(e3.getMessage()); } *************** *** 404,408 **** public String convertDate8Char(String s) { String sdate = "00000000", syear = "", smonth = "", sday = ""; ! _log.debug("s=" + s); if (s != null) { --- 403,407 ---- public String convertDate8Char(String s) { String sdate = "00000000", syear = "", smonth = "", sday = ""; ! logger.debug("s=" + s); if (s != null) { *************** *** 421,425 **** } ! _log.debug("Year" + syear + " Month" + smonth + " Day" + sday); sdate = syear + smonth + sday; --- 420,424 ---- } ! logger.debug("Year" + syear + " Month" + smonth + " Day" + sday); sdate = syear + smonth + sday; *************** *** 427,431 **** sdate = s; } ! _log.debug("sdate:" + sdate); }else { sdate = "00000000"; --- 426,430 ---- sdate = s; } ! logger.debug("sdate:" + sdate); }else { sdate = "00000000"; Index: BillingViewAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil/BillingViewAction.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** BillingViewAction.java 6 Feb 2010 20:21:16 -0000 1.16 --- BillingViewAction.java 15 Nov 2010 01:27:31 -0000 1.17 *************** *** 34,43 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import oscar.entities.Provider; --- 34,43 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; + import org.oscarehr.util.MiscUtils; import oscar.entities.Provider; *************** *** 50,54 **** public final class BillingViewAction extends Action { ! private static Log log = LogFactory.getLog(BillingViewAction.class); public ActionForward execute(ActionMapping mapping, --- 50,54 ---- public final class BillingViewAction extends Action { ! private static Logger log = MiscUtils.getLogger(); public ActionForward execute(ActionMapping mapping, Index: BillingAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil/BillingAction.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** BillingAction.java 19 Jul 2010 18:14:41 -0000 1.20 --- BillingAction.java 15 Nov 2010 01:27:31 -0000 1.21 *************** *** 31,36 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; --- 31,35 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; *************** *** 47,51 **** public final class BillingAction extends Action { ! protected static Log _log = LogFactory.getLog(BillingAction.class); private ServiceCodeValidationLogic vldt = new ServiceCodeValidationLogic(); public ActionForward execute(ActionMapping mapping, --- 46,50 ---- public final class BillingAction extends Action { ! private static Logger _log = MiscUtils.getLogger(); private ServiceCodeValidationLogic vldt = new ServiceCodeValidationLogic(); public ActionForward execute(ActionMapping mapping, Index: BillingCreateBillingForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil/BillingCreateBillingForm.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** BillingCreateBillingForm.java 19 Jul 2010 18:27:10 -0000 1.26 --- BillingCreateBillingForm.java 15 Nov 2010 01:27:31 -0000 1.27 *************** *** 28,40 **** import javax.servlet.http.HttpServletRequest; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; public final class BillingCreateBillingForm extends ActionForm { ! private static final Log _log = LogFactory.getLog(BillingCreateBillingForm.class); private String[] service; --- 28,40 ---- import javax.servlet.http.HttpServletRequest; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; + import org.oscarehr.util.MiscUtils; public final class BillingCreateBillingForm extends ActionForm { ! private static final Logger _log = MiscUtils.getLogger(); private String[] service; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/dms/actions Modified Files: DmsInboxManageAction.java AddEditDocumentAction.java Log Message: changed all commons logging to log4j logging Index: DmsInboxManageAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions/DmsInboxManageAction.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** DmsInboxManageAction.java 9 Nov 2010 21:39:12 -0000 1.14 --- DmsInboxManageAction.java 15 Nov 2010 01:27:32 -0000 1.15 *************** *** 27,32 **** package oscar.dms.actions; - import com.quatro.dao.security.SecObjectNameDao; - import com.quatro.model.security.Secobjectname; import java.util.ArrayList; import java.util.Collections; --- 27,30 ---- *************** *** 56,68 **** import org.oscarehr.common.dao.DocumentResultsDao; import org.oscarehr.common.dao.ProviderInboxRoutingDao; import org.oscarehr.common.dao.QueueDocumentLinkDao; import org.oscarehr.common.model.ProviderInboxItem; import org.oscarehr.common.model.QueueDocumentLink; - import org.oscarehr.util.SpringUtils; - import oscar.dms.EDoc; - import org.oscarehr.common.dao.QueueDao; - import org.oscarehr.common.model.Demographic; import org.oscarehr.document.dao.DocumentDAO; import org.oscarehr.util.MiscUtils; import oscar.dms.EDocUtil; import oscar.oscarLab.ca.all.Hl7textResultsData; --- 54,67 ---- import org.oscarehr.common.dao.DocumentResultsDao; import org.oscarehr.common.dao.ProviderInboxRoutingDao; + import org.oscarehr.common.dao.QueueDao; import org.oscarehr.common.dao.QueueDocumentLinkDao; + import org.oscarehr.common.model.Demographic; import org.oscarehr.common.model.ProviderInboxItem; import org.oscarehr.common.model.QueueDocumentLink; import org.oscarehr.document.dao.DocumentDAO; import org.oscarehr.util.MiscUtils; + import org.oscarehr.util.SpringUtils; + + import oscar.dms.EDoc; import oscar.dms.EDocUtil; import oscar.oscarLab.ca.all.Hl7textResultsData; *************** *** 72,75 **** --- 71,77 ---- import oscar.util.OscarRoleObjectPrivilege; + import com.quatro.dao.security.SecObjectNameDao; + import com.quatro.model.security.Secobjectname; + /** * Index: AddEditDocumentAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/actions/AddEditDocumentAction.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** AddEditDocumentAction.java 4 Nov 2010 06:25:16 -0000 1.33 --- AddEditDocumentAction.java 15 Nov 2010 01:27:32 -0000 1.34 *************** *** 35,39 **** import javax.servlet.http.HttpSession; - import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 35,38 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/login Modified Files: SiteCheckAction.java DBHelp.java Log Message: changed all commons logging to log4j logging Index: DBHelp.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login/DBHelp.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** DBHelp.java 6 Oct 2010 08:03:18 -0000 1.19 --- DBHelp.java 15 Nov 2010 01:27:32 -0000 1.20 *************** *** 14,19 **** import oscar.oscarDB.DBHandler; - import oscar.oscarDB.DBPreparedHandler; - import oscar.oscarDB.DBPreparedHandlerParam; import oscar.util.SqlUtils; --- 14,17 ---- Index: SiteCheckAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login/SiteCheckAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SiteCheckAction.java 19 Jul 2010 20:24:18 -0000 1.4 --- SiteCheckAction.java 15 Nov 2010 01:27:32 -0000 1.5 *************** *** 31,35 **** import org.oscarehr.common.model.Provider; import org.oscarehr.util.SpringUtils; - import org.springframework.context.ApplicationContext; import oscar.log.LogAction; --- 31,34 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service/impl In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service/impl Modified Files: SurveyManagerImpl.java BedDemographicManagerImpl.java RoomDemographicManagerImpl.java StreetHealthReportManagerImpl.java IntakeAManagerImpl.java Log Message: changed all commons logging to log4j logging Index: StreetHealthReportManagerImpl.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service/impl/StreetHealthReportManagerImpl.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** StreetHealthReportManagerImpl.java 9 Jul 2010 21:56:36 -0000 1.7 --- StreetHealthReportManagerImpl.java 15 Nov 2010 01:27:31 -0000 1.8 *************** *** 5,10 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.dao.ClientDao; import org.oscarehr.PMmodule.model.Intake; --- 5,9 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.dao.ClientDao; import org.oscarehr.PMmodule.model.Intake; *************** *** 12,15 **** --- 11,15 ---- import org.oscarehr.PMmodule.service.StreetHealthReportManager; import org.oscarehr.common.model.Demographic; + import org.oscarehr.util.MiscUtils; import org.springframework.transaction.annotation.Transactional; *************** *** 17,21 **** public class StreetHealthReportManagerImpl implements StreetHealthReportManager { ! private Log log = LogFactory.getLog(StreetHealthReportManagerImpl.class); private ClientDao clientDao; --- 17,21 ---- public class StreetHealthReportManagerImpl implements StreetHealthReportManager { ! private Logger log=MiscUtils.getLogger(); private ClientDao clientDao; Index: BedDemographicManagerImpl.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service/impl/BedDemographicManagerImpl.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** BedDemographicManagerImpl.java 16 Jun 2009 18:33:26 -0000 1.13 --- BedDemographicManagerImpl.java 15 Nov 2010 01:27:31 -0000 1.14 *************** *** 25,30 **** import java.util.Date; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.dao.BedDAO; import org.oscarehr.PMmodule.dao.BedDemographicDao; --- 25,29 ---- import java.util.Date; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.dao.BedDAO; import org.oscarehr.PMmodule.dao.BedDemographicDao; *************** *** 42,45 **** --- 41,45 ---- import org.oscarehr.PMmodule.service.BedDemographicManager; import org.oscarehr.common.model.Demographic; + import org.oscarehr.util.MiscUtils; import org.springframework.transaction.annotation.Transactional; *************** *** 50,54 **** public class BedDemographicManagerImpl implements BedDemographicManager { ! private static final Log log = LogFactory.getLog(BedDemographicManagerImpl.class); private static <T extends Exception> void handleException(T e) throws T { --- 50,54 ---- public class BedDemographicManagerImpl implements BedDemographicManager { ! private static final Logger log=MiscUtils.getLogger(); private static <T extends Exception> void handleException(T e) throws T { Index: RoomDemographicManagerImpl.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service/impl/RoomDemographicManagerImpl.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** RoomDemographicManagerImpl.java 17 Feb 2009 20:13:37 -0000 1.13 --- RoomDemographicManagerImpl.java 15 Nov 2010 01:27:31 -0000 1.14 *************** *** 25,30 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.dao.BedDemographicDao; import org.oscarehr.PMmodule.dao.ClientDao; --- 25,29 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.dao.BedDemographicDao; import org.oscarehr.PMmodule.dao.ClientDao; *************** *** 36,39 **** --- 35,39 ---- import org.oscarehr.PMmodule.model.RoomDemographic; import org.oscarehr.PMmodule.service.RoomDemographicManager; + import org.oscarehr.util.MiscUtils; import org.springframework.transaction.annotation.Transactional; *************** *** 44,48 **** public class RoomDemographicManagerImpl implements RoomDemographicManager { ! private static final Log log = LogFactory.getLog(RoomDemographicManagerImpl.class); private static <T extends Exception> void handleException(T e) throws T { --- 44,48 ---- public class RoomDemographicManagerImpl implements RoomDemographicManager { ! private static final Logger log=MiscUtils.getLogger(); private static <T extends Exception> void handleException(T e) throws T { Index: IntakeAManagerImpl.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service/impl/IntakeAManagerImpl.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** IntakeAManagerImpl.java 9 Jul 2010 21:56:36 -0000 1.6 --- IntakeAManagerImpl.java 15 Nov 2010 01:27:31 -0000 1.7 *************** *** 27,32 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.dao.ClientDao; import org.oscarehr.PMmodule.dao.IntakeADao; --- 27,31 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.dao.ClientDao; import org.oscarehr.PMmodule.dao.IntakeADao; *************** *** 34,37 **** --- 33,37 ---- import org.oscarehr.PMmodule.service.IntakeAManager; import org.oscarehr.common.model.Demographic; + import org.oscarehr.util.MiscUtils; import org.springframework.transaction.annotation.Transactional; *************** *** 39,43 **** public class IntakeAManagerImpl extends BaseIntakeManager implements IntakeAManager { ! private static Log log = LogFactory.getLog(IntakeAManagerImpl.class); private IntakeADao dao; --- 39,43 ---- public class IntakeAManagerImpl extends BaseIntakeManager implements IntakeAManager { ! private static Logger log = MiscUtils.getLogger(); private IntakeADao dao; Index: SurveyManagerImpl.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service/impl/SurveyManagerImpl.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SurveyManagerImpl.java 9 Jul 2010 21:56:36 -0000 1.12 --- SurveyManagerImpl.java 15 Nov 2010 01:27:31 -0000 1.13 *************** *** 29,34 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.util.LabelValueBean; import org.oscarehr.PMmodule.dao.SurveyDAO; --- 29,33 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.apache.struts.util.LabelValueBean; import org.oscarehr.PMmodule.dao.SurveyDAO; *************** *** 53,57 **** public class SurveyManagerImpl implements SurveyManager, CustomReportDataSource { ! Log log = LogFactory.getLog(SurveyManagerImpl.class); private SurveyDAO surveyDAO; --- 52,56 ---- public class SurveyManagerImpl implements SurveyManager, CustomReportDataSource { ! Logger log=MiscUtils.getLogger(); private SurveyDAO surveyDAO; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/decisionSupport/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/decisionSupport/dao Modified Files: DSGuidelineDAO.java Log Message: changed all commons logging to log4j logging Index: DSGuidelineDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/decisionSupport/dao/DSGuidelineDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DSGuidelineDAO.java 9 Jul 2010 21:56:39 -0000 1.2 --- DSGuidelineDAO.java 15 Nov 2010 01:27:31 -0000 1.3 *************** *** 8,15 **** import java.util.ArrayList; import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.decisionSupport.model.DSGuideline; import org.oscarehr.decisionSupport.model.DSGuidelineProviderMapping; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 8,16 ---- import java.util.ArrayList; import java.util.List; ! ! import org.apache.log4j.Logger; import org.oscarehr.decisionSupport.model.DSGuideline; import org.oscarehr.decisionSupport.model.DSGuidelineProviderMapping; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 19,23 **** */ public class DSGuidelineDAO extends HibernateDaoSupport { ! private static Log _log = LogFactory.getLog(DSGuidelineDAO.class); public DSGuidelineDAO() { --- 20,24 ---- */ public class DSGuidelineDAO extends HibernateDaoSupport { ! private static final Logger log2 = MiscUtils.getLogger(); public DSGuidelineDAO() { |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/ocan/domain/submission Modified Files: SideEffectsDetailList.java MedicationList.java ConcernAreaList.java LegalStatusList.java Domain.java SafetyToSelfRiskList.java PresentingIssueList.java OtherIllnessList.java AddictionTypeList.java ImmigExpList.java TimeLivedInCanada.java OCANSubmissionFile.java SymptomList.java OCANDomains.java DrinkAlcohol.java DiagnosticList.java RiskUnemploymentList.java ActionList.java ObjectFactory.java ClientContact.java ReferralList.java DiscrimExpList.java DrugUseList.java MedicalConditionList.java Log Message: changed all commons logging to log4j logging Index: OtherIllnessList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/OtherIllnessList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OtherIllnessList.java 27 May 2009 07:26:33 -0000 1.1 --- OtherIllnessList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: DrinkAlcohol.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/DrinkAlcohol.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DrinkAlcohol.java 27 May 2009 07:26:33 -0000 1.1 --- DrinkAlcohol.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: RiskUnemploymentList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/RiskUnemploymentList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RiskUnemploymentList.java 27 May 2009 07:26:33 -0000 1.1 --- RiskUnemploymentList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: MedicationList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/MedicationList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MedicationList.java 27 May 2009 07:26:33 -0000 1.1 --- MedicationList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: ConcernAreaList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/ConcernAreaList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConcernAreaList.java 27 May 2009 07:26:33 -0000 1.1 --- ConcernAreaList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: TimeLivedInCanada.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/TimeLivedInCanada.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TimeLivedInCanada.java 27 May 2009 07:26:33 -0000 1.1 --- TimeLivedInCanada.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: Domain.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/Domain.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Domain.java 27 May 2009 07:26:33 -0000 1.1 --- Domain.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: ClientContact.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/ClientContact.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClientContact.java 27 May 2009 07:26:33 -0000 1.1 --- ClientContact.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: MedicalConditionList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/MedicalConditionList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MedicalConditionList.java 27 May 2009 07:26:33 -0000 1.1 --- MedicalConditionList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: SymptomList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/SymptomList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SymptomList.java 27 May 2009 07:26:33 -0000 1.1 --- SymptomList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: ObjectFactory.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/ObjectFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ObjectFactory.java 27 May 2009 07:26:33 -0000 1.1 --- ObjectFactory.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementDecl; Index: ReferralList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/ReferralList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReferralList.java 27 May 2009 07:26:33 -0000 1.1 --- ReferralList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: DrugUseList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/DrugUseList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DrugUseList.java 27 May 2009 07:26:33 -0000 1.1 --- DrugUseList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: ImmigExpList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/ImmigExpList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ImmigExpList.java 27 May 2009 07:26:33 -0000 1.1 --- ImmigExpList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: OCANSubmissionFile.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/OCANSubmissionFile.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OCANSubmissionFile.java 27 May 2009 07:26:33 -0000 1.1 --- OCANSubmissionFile.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: ActionList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/ActionList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ActionList.java 27 May 2009 07:26:33 -0000 1.1 --- ActionList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: SideEffectsDetailList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/SideEffectsDetailList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SideEffectsDetailList.java 27 May 2009 07:26:33 -0000 1.1 --- SideEffectsDetailList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: OCANDomains.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/OCANDomains.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OCANDomains.java 27 May 2009 07:26:33 -0000 1.1 --- OCANDomains.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: LegalStatusList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/LegalStatusList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LegalStatusList.java 27 May 2009 07:26:33 -0000 1.1 --- LegalStatusList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: AddictionTypeList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/AddictionTypeList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AddictionTypeList.java 27 May 2009 07:26:33 -0000 1.1 --- AddictionTypeList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: SafetyToSelfRiskList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/SafetyToSelfRiskList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SafetyToSelfRiskList.java 27 May 2009 07:26:33 -0000 1.1 --- SafetyToSelfRiskList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: DiagnosticList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/DiagnosticList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DiagnosticList.java 27 May 2009 07:26:33 -0000 1.1 --- DiagnosticList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: DiscrimExpList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/DiscrimExpList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DiscrimExpList.java 27 May 2009 07:26:33 -0000 1.1 --- DiscrimExpList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: PresentingIssueList.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/submission/PresentingIssueList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PresentingIssueList.java 27 May 2009 07:26:33 -0000 1.1 --- PresentingIssueList.java 15 Nov 2010 01:27:31 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/filters In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/filters Modified Files: SetCharacterEncodingFilter.java Log Message: changed all commons logging to log4j logging Index: SetCharacterEncodingFilter.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/filters/SetCharacterEncodingFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SetCharacterEncodingFilter.java 22 Oct 2010 00:45:37 -0000 1.2 --- SetCharacterEncodingFilter.java 15 Nov 2010 01:27:32 -0000 1.3 *************** *** 20,23 **** --- 20,24 ---- import java.io.IOException; + import javax.servlet.Filter; import javax.servlet.FilterChain; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/data Modified Files: MeasurementTypes.java ImportMeasurementTypes.java Log Message: changed all commons logging to log4j logging Index: ImportMeasurementTypes.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/data/ImportMeasurementTypes.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ImportMeasurementTypes.java 20 Feb 2009 17:50:52 -0000 1.4 --- ImportMeasurementTypes.java 15 Nov 2010 01:27:32 -0000 1.5 *************** *** 33,41 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.jdom.Document; import org.jdom.Element; import org.jdom.input.SAXBuilder; import oscar.oscarEncounter.oscarMeasurements.bean.EctMeasurementTypesBean; --- 33,41 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.jdom.Document; import org.jdom.Element; import org.jdom.input.SAXBuilder; + import org.oscarehr.util.MiscUtils; import oscar.oscarEncounter.oscarMeasurements.bean.EctMeasurementTypesBean; *************** *** 49,53 **** public class ImportMeasurementTypes { ! private static Log log = LogFactory.getLog(ImportMeasurementTypes.class); /** --- 49,53 ---- public class ImportMeasurementTypes { ! private static Logger log = MiscUtils.getLogger(); /** Index: MeasurementTypes.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/data/MeasurementTypes.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MeasurementTypes.java 6 Oct 2010 21:52:12 -0000 1.9 --- MeasurementTypes.java 15 Nov 2010 01:27:32 -0000 1.10 *************** *** 33,38 **** import java.util.Hashtable; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 33,37 ---- import java.util.Hashtable; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 45,49 **** */ public class MeasurementTypes { ! private static Log log = LogFactory.getLog(MeasurementTypes.class); static MeasurementTypes measurementTypes = new MeasurementTypes(); boolean loaded = false; --- 44,48 ---- */ public class MeasurementTypes { ! private static Logger log = MiscUtils.getLogger(); static MeasurementTypes measurementTypes = new MeasurementTypes(); boolean loaded = false; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/survey/dao/oscar/hibernate In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/survey/dao/oscar/hibernate Modified Files: OscarFormDAOHibernate.java Log Message: changed all commons logging to log4j logging Index: OscarFormDAOHibernate.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/survey/dao/oscar/hibernate/OscarFormDAOHibernate.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** OscarFormDAOHibernate.java 11 Nov 2010 01:35:14 -0000 1.16 --- OscarFormDAOHibernate.java 15 Nov 2010 01:27:31 -0000 1.17 *************** *** 33,37 **** import java.util.Iterator; import java.util.LinkedHashMap; - import java.util.LinkedList; import java.util.List; import java.util.Map; --- 33,36 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil Modified Files: MeasurementGraphAction2.java EctStreamStyleSheet.java Log Message: changed all commons logging to log4j logging Index: MeasurementGraphAction2.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil/MeasurementGraphAction2.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MeasurementGraphAction2.java 6 Oct 2010 08:45:26 -0000 1.13 --- MeasurementGraphAction2.java 15 Nov 2010 01:27:31 -0000 1.14 *************** *** 43,48 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; --- 43,47 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; *************** *** 91,95 **** public class MeasurementGraphAction2 extends Action { ! private static Log log = LogFactory.getLog(MeasurementGraphAction2.class); public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException { --- 90,94 ---- public class MeasurementGraphAction2 extends Action { ! private static Logger log = MiscUtils.getLogger(); public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException { Index: EctStreamStyleSheet.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil/EctStreamStyleSheet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EctStreamStyleSheet.java 9 Jul 2010 21:56:40 -0000 1.4 --- EctStreamStyleSheet.java 15 Nov 2010 01:27:31 -0000 1.5 *************** *** 36,41 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; --- 36,40 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; *************** *** 51,55 **** public class EctStreamStyleSheet extends DownloadAction{ ! private static Log log = LogFactory.getLog(EctStreamStyleSheet.class); /** Creates a new instance of DisplayImageAction */ --- 50,54 ---- public class EctStreamStyleSheet extends DownloadAction{ ! private static Logger log = MiscUtils.getLogger(); /** Creates a new instance of DisplayImageAction */ |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao Modified Files: AdmissionDao.java BedDAO.java GenericIntakeDAO.java ClientReferralDAO.java RoomDAO.java IntakeADao.java RoomDemographicDao.java RoleDAO.java IntakeCDao.java ProgramProviderDAO.java BedCheckTimeDAO.java RoomBedDAO.java ProviderDao.java MergeClientDao.java GenericIntakeNodeDAO.java JointAdmissionDAO.java FormsDAO.java ProgramClientStatusDAO.java ProgramTeamDAO.java HealthSafetyDao.java BedDemographicDao.java ProgramQueueDao.java StreetHealthDao.java ProgramSignatureDao.java ProgramAccessDAO.java ProgramDao.java ClientDao.java ProgramClientRestrictionDAO.java ProgramFunctionalUserDAO.java AgencyDao.java SecUserRoleDao.java LogDAO.java Log Message: changed all commons logging to log4j logging Index: IntakeCDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/IntakeCDao.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IntakeCDao.java 11 Sep 2008 21:15:32 -0000 1.4 --- IntakeCDao.java 15 Nov 2010 01:27:30 -0000 1.5 *************** *** 28,40 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; ! import org.oscarehr.common.model.Demographic; import org.oscarehr.PMmodule.model.Formintakec; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class IntakeCDao extends HibernateDaoSupport { ! private static Log log = LogFactory.getLog(IntakeCDao.class); public Formintakec getCurrentForm(Integer demographicNo) { --- 28,40 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.Formintakec; + import org.oscarehr.common.model.Demographic; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class IntakeCDao extends HibernateDaoSupport { ! private static Logger log = MiscUtils.getLogger(); public Formintakec getCurrentForm(Integer demographicNo) { Index: GenericIntakeNodeDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/GenericIntakeNodeDAO.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** GenericIntakeNodeDAO.java 25 Aug 2009 18:22:25 -0000 1.16 --- GenericIntakeNodeDAO.java 15 Nov 2010 01:27:30 -0000 1.17 *************** *** 29,34 **** import java.util.TreeSet; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.hibernate.ObjectNotFoundException; import org.oscarehr.PMmodule.model.Agency; --- 29,33 ---- import java.util.TreeSet; ! import org.apache.log4j.Logger; import org.hibernate.ObjectNotFoundException; import org.oscarehr.PMmodule.model.Agency; *************** *** 39,42 **** --- 38,42 ---- import org.oscarehr.PMmodule.model.IntakeNodeTemplate; import org.oscarehr.util.DbConnectionFilter; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 46,51 **** public class GenericIntakeNodeDAO extends HibernateDaoSupport { ! private static final Log LOG = LogFactory ! .getLog(GenericIntakeNodeDAO.class); /** --- 46,50 ---- public class GenericIntakeNodeDAO extends HibernateDaoSupport { ! private static final Logger LOG = MiscUtils.getLogger(); /** Index: BedCheckTimeDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/BedCheckTimeDAO.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BedCheckTimeDAO.java 28 Sep 2007 18:55:33 -0000 1.3 --- BedCheckTimeDAO.java 15 Nov 2010 01:27:30 -0000 1.4 *************** *** 27,38 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.BedCheckTime; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class BedCheckTimeDAO extends HibernateDaoSupport { ! private static final Log log = LogFactory.getLog(BedCheckTimeDAO.class); public boolean bedCheckTimeExists(Integer programId, Date time) { --- 27,38 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.BedCheckTime; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class BedCheckTimeDAO extends HibernateDaoSupport { ! private static final Logger log=MiscUtils.getLogger(); public boolean bedCheckTimeExists(Integer programId, Date time) { Index: RoomDemographicDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/RoomDemographicDao.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RoomDemographicDao.java 17 Jun 2008 20:36:03 -0000 1.1 --- RoomDemographicDao.java 15 Nov 2010 01:27:30 -0000 1.2 *************** *** 25,32 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.RoomDemographic; import org.oscarehr.PMmodule.model.RoomDemographicPK; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 25,32 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.RoomDemographic; import org.oscarehr.PMmodule.model.RoomDemographicPK; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 36,40 **** public class RoomDemographicDao extends HibernateDaoSupport { ! private static final Log log = LogFactory.getLog(RoomDemographicDao.class); /** --- 36,40 ---- public class RoomDemographicDao extends HibernateDaoSupport { ! private static final Logger log=MiscUtils.getLogger(); /** Index: SecUserRoleDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/SecUserRoleDao.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SecUserRoleDao.java 13 Oct 2009 20:55:08 -0000 1.3 --- SecUserRoleDao.java 15 Nov 2010 01:27:30 -0000 1.4 *************** *** 25,36 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.SecUserRole; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class SecUserRoleDao extends HibernateDaoSupport { ! private static Log log = LogFactory.getLog(SecUserRoleDao.class); public List<SecUserRole> getUserRoles(String providerNo) { --- 25,36 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.SecUserRole; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class SecUserRoleDao extends HibernateDaoSupport { ! private static Logger log = MiscUtils.getLogger(); public List<SecUserRole> getUserRoles(String providerNo) { Index: GenericIntakeDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/GenericIntakeDAO.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** GenericIntakeDAO.java 28 May 2009 08:36:03 -0000 1.23 --- GenericIntakeDAO.java 15 Nov 2010 01:27:30 -0000 1.24 *************** *** 38,50 **** import java.util.TreeSet; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; ! import org.oscarehr.common.model.Demographic; import org.oscarehr.PMmodule.model.Intake; import org.oscarehr.PMmodule.model.IntakeNode; import org.oscarehr.common.model.Provider; import org.oscarehr.common.model.ReportStatistic; import org.oscarehr.util.AccumulatorMap; import org.oscarehr.util.DbConnectionFilter; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 38,50 ---- import java.util.TreeSet; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.Intake; import org.oscarehr.PMmodule.model.IntakeNode; + import org.oscarehr.common.model.Demographic; import org.oscarehr.common.model.Provider; import org.oscarehr.common.model.ReportStatistic; import org.oscarehr.util.AccumulatorMap; import org.oscarehr.util.DbConnectionFilter; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 56,60 **** public class GenericIntakeDAO extends HibernateDaoSupport { ! private static final Log LOG = LogFactory.getLog(GenericIntakeDAO.class); @SuppressWarnings("unchecked") --- 56,60 ---- public class GenericIntakeDAO extends HibernateDaoSupport { ! private static final Logger LOG = MiscUtils.getLogger(); @SuppressWarnings("unchecked") Index: ProgramClientRestrictionDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/ProgramClientRestrictionDAO.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ProgramClientRestrictionDAO.java 29 Mar 2010 18:46:10 -0000 1.10 --- ProgramClientRestrictionDAO.java 15 Nov 2010 01:27:30 -0000 1.11 *************** *** 5,12 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; ! import org.oscarehr.common.dao.DemographicDao; import org.oscarehr.PMmodule.model.ProgramClientRestriction; import org.springframework.beans.factory.annotation.Required; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 5,12 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.ProgramClientRestriction; + import org.oscarehr.common.dao.DemographicDao; + import org.oscarehr.util.MiscUtils; import org.springframework.beans.factory.annotation.Required; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 19,23 **** private ProviderDao providerDao; ! private static Log log = LogFactory.getLog(ProgramClientRestrictionDAO.class); public Collection<ProgramClientRestriction> find(int programId, int demographicNo) { --- 19,23 ---- private ProviderDao providerDao; ! private static Logger log = MiscUtils.getLogger(); public Collection<ProgramClientRestriction> find(int programId, int demographicNo) { Index: ProgramTeamDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/ProgramTeamDAO.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ProgramTeamDAO.java 28 Sep 2007 18:55:33 -0000 1.3 --- ProgramTeamDAO.java 15 Nov 2010 01:27:30 -0000 1.4 *************** *** 25,37 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.hibernate.Query; import org.oscarehr.PMmodule.model.ProgramTeam; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class ProgramTeamDAO extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(ProgramTeamDAO.class); /* --- 25,37 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.hibernate.Query; import org.oscarehr.PMmodule.model.ProgramTeam; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class ProgramTeamDAO extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); /* Index: AdmissionDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/AdmissionDao.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** AdmissionDao.java 16 Jul 2010 19:07:05 -0000 1.25 --- AdmissionDao.java 15 Nov 2010 01:27:30 -0000 1.26 *************** *** 26,45 **** import java.util.Calendar; import java.util.Date; - import java.util.Iterator; import java.util.List; import java.util.ListIterator; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; import org.oscarehr.PMmodule.model.Admission; import org.oscarehr.PMmodule.model.AdmissionSearchBean; ! import org.oscarehr.common.model.Demographic; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class AdmissionDao extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(AdmissionDao.class); public List<Admission> getAdmissions_archiveView(Integer programId, Integer demographicNo) { --- 26,43 ---- import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.ListIterator; ! import org.apache.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; import org.oscarehr.PMmodule.model.Admission; import org.oscarehr.PMmodule.model.AdmissionSearchBean; ! import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class AdmissionDao extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); public List<Admission> getAdmissions_archiveView(Integer programId, Integer demographicNo) { Index: ClientReferralDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/ClientReferralDAO.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ClientReferralDAO.java 12 Jul 2010 20:04:13 -0000 1.13 --- ClientReferralDAO.java 15 Nov 2010 01:27:30 -0000 1.14 *************** *** 26,40 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.hibernate.Criteria; import org.hibernate.criterion.Expression; import org.oscarehr.PMmodule.model.Admission; import org.oscarehr.PMmodule.model.ClientReferral; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class ClientReferralDAO extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(getClass()); public List<ClientReferral> getReferrals() { --- 26,40 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.criterion.Expression; import org.oscarehr.PMmodule.model.Admission; import org.oscarehr.PMmodule.model.ClientReferral; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class ClientReferralDAO extends HibernateDaoSupport { ! private Logger log = MiscUtils.getLogger(); public List<ClientReferral> getReferrals() { Index: ProgramQueueDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/ProgramQueueDao.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ProgramQueueDao.java 28 Sep 2007 18:55:33 -0000 1.4 --- ProgramQueueDao.java 15 Nov 2010 01:27:30 -0000 1.5 *************** *** 25,36 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.ProgramQueue; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class ProgramQueueDao extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(ProgramQueueDao.class); --- 25,36 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.ProgramQueue; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class ProgramQueueDao extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); Index: StreetHealthDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/StreetHealthDao.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StreetHealthDao.java 18 Jul 2008 04:13:44 -0000 1.1 --- StreetHealthDao.java 15 Nov 2010 01:27:30 -0000 1.2 *************** *** 1,11 **** package org.oscarehr.PMmodule.dao; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class StreetHealthDao extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(StreetHealthDao.class); --- 1,11 ---- package org.oscarehr.PMmodule.dao; ! import org.apache.log4j.Logger; ! import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class StreetHealthDao extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); Index: HealthSafetyDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/HealthSafetyDao.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HealthSafetyDao.java 2 Mar 2008 00:06:07 -0000 1.1 --- HealthSafetyDao.java 15 Nov 2010 01:27:30 -0000 1.2 *************** *** 25,36 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.HealthSafety; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class HealthSafetyDao extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(HealthSafetyDao.class); public HealthSafety getHealthSafetyByDemographic(Long demographicNo) { --- 25,36 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.HealthSafety; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class HealthSafetyDao extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); public HealthSafety getHealthSafetyByDemographic(Long demographicNo) { Index: ProgramSignatureDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/ProgramSignatureDao.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ProgramSignatureDao.java 28 Sep 2007 18:55:33 -0000 1.2 --- ProgramSignatureDao.java 15 Nov 2010 01:27:30 -0000 1.3 *************** *** 25,36 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.ProgramSignature; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class ProgramSignatureDao extends HibernateDaoSupport { ! private static final Log log = LogFactory.getLog(ProgramSignatureDao.class); //get the creator of the program --- 25,36 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.ProgramSignature; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class ProgramSignatureDao extends HibernateDaoSupport { ! private static final Logger log=MiscUtils.getLogger(); //get the creator of the program Index: ProgramDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/ProgramDao.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** ProgramDao.java 2 Jul 2010 19:47:26 -0000 1.45 --- ProgramDao.java 15 Nov 2010 01:27:30 -0000 1.46 *************** *** 24,40 **** import java.util.List; - import java.util.ArrayList; import org.apache.commons.lang.StringEscapeUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.hibernate.Criteria; import org.hibernate.Query; - import org.hibernate.SQLQuery; - import org.hibernate.Hibernate; import org.hibernate.criterion.Expression; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; import org.oscarehr.PMmodule.model.Program; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 24,37 ---- import java.util.List; import org.apache.commons.lang.StringEscapeUtils; ! import org.apache.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.criterion.Expression; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; import org.oscarehr.PMmodule.model.Program; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 46,50 **** public class ProgramDao extends HibernateDaoSupport { ! private static final Log log = LogFactory.getLog(ProgramDao.class); public boolean isBedProgram(Integer programId) { --- 43,47 ---- public class ProgramDao extends HibernateDaoSupport { ! private static final Logger log=MiscUtils.getLogger(); public boolean isBedProgram(Integer programId) { Index: ProgramAccessDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/ProgramAccessDAO.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ProgramAccessDAO.java 4 Dec 2009 22:19:52 -0000 1.8 --- ProgramAccessDAO.java 15 Nov 2010 01:27:30 -0000 1.9 *************** *** 28,35 **** import org.apache.commons.lang.time.DateUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.AccessType; import org.oscarehr.PMmodule.model.ProgramAccess; import org.oscarehr.util.TimeClearedHashMap; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 28,35 ---- import org.apache.commons.lang.time.DateUtils; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.AccessType; import org.oscarehr.PMmodule.model.ProgramAccess; + import org.oscarehr.util.MiscUtils; import org.oscarehr.util.TimeClearedHashMap; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 37,41 **** public class ProgramAccessDAO extends HibernateDaoSupport { ! private static Log log = LogFactory.getLog(ProgramAccessDAO.class); private static Map<Long, List<ProgramAccess>> programAccessListByProgramIdCache=Collections.synchronizedMap(new TimeClearedHashMap<Long, List<ProgramAccess>>(DateUtils.MILLIS_PER_HOUR, DateUtils.MILLIS_PER_HOUR)); --- 37,41 ---- public class ProgramAccessDAO extends HibernateDaoSupport { ! private static Logger log = MiscUtils.getLogger(); private static Map<Long, List<ProgramAccess>> programAccessListByProgramIdCache=Collections.synchronizedMap(new TimeClearedHashMap<Long, List<ProgramAccess>>(DateUtils.MILLIS_PER_HOUR, DateUtils.MILLIS_PER_HOUR)); Index: FormsDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/FormsDAO.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FormsDAO.java 11 Sep 2008 22:48:34 -0000 1.4 --- FormsDAO.java 15 Nov 2010 01:27:30 -0000 1.5 *************** *** 28,40 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.FormInfo; import org.oscarehr.common.model.Provider; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class FormsDAO extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(FormsDAO.class); public void saveForm(Object o) { --- 28,40 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.FormInfo; import org.oscarehr.common.model.Provider; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class FormsDAO extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); public void saveForm(Object o) { Index: JointAdmissionDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/JointAdmissionDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JointAdmissionDAO.java 18 Mar 2008 19:41:32 -0000 1.2 --- JointAdmissionDAO.java 15 Nov 2010 01:27:30 -0000 1.3 *************** *** 33,39 **** import java.util.ListIterator; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.JointAdmission; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 33,39 ---- import java.util.ListIterator; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.JointAdmission; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 44,48 **** public class JointAdmissionDAO extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(JointAdmissionDAO.class); /** Creates a new instance of JointAdmissionDAO */ --- 44,48 ---- public class JointAdmissionDAO extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); /** Creates a new instance of JointAdmissionDAO */ Index: LogDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/LogDAO.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LogDAO.java 28 Sep 2007 18:55:33 -0000 1.3 --- LogDAO.java 15 Nov 2010 01:27:30 -0000 1.4 *************** *** 23,27 **** package org.oscarehr.PMmodule.dao; - import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.Log; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 23,26 ---- *************** *** 29,34 **** public class LogDAO extends HibernateDaoSupport { - private static org.apache.commons.logging.Log log = LogFactory.getLog(LogDAO.class); - public void saveLog(Log logObj) { this.getHibernateTemplate().save(logObj); --- 28,31 ---- Index: ProgramProviderDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/ProgramProviderDAO.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** ProgramProviderDAO.java 25 Mar 2010 02:57:31 -0000 1.28 --- ProgramProviderDAO.java 15 Nov 2010 01:27:30 -0000 1.29 *************** *** 29,37 **** import org.apache.commons.lang.time.DateUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.caisi.model.FacilityMessage; import org.oscarehr.PMmodule.model.ProgramProvider; import org.oscarehr.common.model.Facility; import org.oscarehr.util.TimeClearedHashMap; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 29,37 ---- import org.apache.commons.lang.time.DateUtils; ! import org.apache.log4j.Logger; import org.caisi.model.FacilityMessage; import org.oscarehr.PMmodule.model.ProgramProvider; import org.oscarehr.common.model.Facility; + import org.oscarehr.util.MiscUtils; import org.oscarehr.util.TimeClearedHashMap; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 39,43 **** public class ProgramProviderDAO extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(ProgramProviderDAO.class); private static Map<String, List<ProgramProvider>> programProviderByProviderProgramIdCache = Collections.synchronizedMap(new TimeClearedHashMap<String, List<ProgramProvider>>(DateUtils.MILLIS_PER_HOUR, DateUtils.MILLIS_PER_HOUR)); --- 39,43 ---- public class ProgramProviderDAO extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); private static Map<String, List<ProgramProvider>> programProviderByProviderProgramIdCache = Collections.synchronizedMap(new TimeClearedHashMap<String, List<ProgramProvider>>(DateUtils.MILLIS_PER_HOUR, DateUtils.MILLIS_PER_HOUR)); Index: BedDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/BedDAO.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** BedDAO.java 4 Mar 2008 02:51:26 -0000 1.9 --- BedDAO.java 15 Nov 2010 01:27:30 -0000 1.10 *************** *** 26,34 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.exception.BedReservedException; import org.oscarehr.PMmodule.model.Bed; import org.oscarehr.PMmodule.model.BedType; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 26,34 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.exception.BedReservedException; import org.oscarehr.PMmodule.model.Bed; import org.oscarehr.PMmodule.model.BedType; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 38,42 **** public class BedDAO extends HibernateDaoSupport { ! private static final Log log = LogFactory.getLog(BedDAO.class); /** --- 38,42 ---- public class BedDAO extends HibernateDaoSupport { ! private static final Logger log=MiscUtils.getLogger(); /** Index: RoleDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/RoleDAO.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RoleDAO.java 23 Jan 2008 23:53:35 -0000 1.5 --- RoleDAO.java 15 Nov 2010 01:27:30 -0000 1.6 *************** *** 25,36 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.caisi.model.Role; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class RoleDAO extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(RoleDAO.class); public List<Role> getRoles() { --- 25,36 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.caisi.model.Role; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class RoleDAO extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); public List<Role> getRoles() { Index: IntakeADao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/IntakeADao.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IntakeADao.java 28 Sep 2007 18:55:33 -0000 1.3 --- IntakeADao.java 15 Nov 2010 01:27:30 -0000 1.4 *************** *** 25,35 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.Formintakea; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class IntakeADao extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(IntakeADao.class); public Formintakea getCurrIntakeAByDemographicNo(String demographicNo) { --- 25,35 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.Formintakea; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class IntakeADao extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); public Formintakea getCurrIntakeAByDemographicNo(String demographicNo) { Index: ProgramFunctionalUserDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/ProgramFunctionalUserDAO.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ProgramFunctionalUserDAO.java 18 Mar 2008 19:41:32 -0000 1.4 --- ProgramFunctionalUserDAO.java 15 Nov 2010 01:27:30 -0000 1.5 *************** *** 25,38 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.hibernate.Query; import org.oscarehr.PMmodule.model.FunctionalUserType; import org.oscarehr.PMmodule.model.ProgramFunctionalUser; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class ProgramFunctionalUserDAO extends HibernateDaoSupport { ! private static Log log = LogFactory.getLog(ProgramFunctionalUserDAO.class); public List getFunctionalUserTypes() { --- 25,38 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.hibernate.Query; import org.oscarehr.PMmodule.model.FunctionalUserType; import org.oscarehr.PMmodule.model.ProgramFunctionalUser; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class ProgramFunctionalUserDAO extends HibernateDaoSupport { ! private static Logger log = MiscUtils.getLogger(); public List getFunctionalUserTypes() { Index: AgencyDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/AgencyDao.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AgencyDao.java 16 Apr 2008 15:31:56 -0000 1.4 --- AgencyDao.java 15 Nov 2010 01:27:30 -0000 1.5 *************** *** 25,36 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.Agency; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class AgencyDao extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(AgencyDao.class); public Agency getLocalAgency() { --- 25,36 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.Agency; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class AgencyDao extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); public Agency getLocalAgency() { Index: RoomDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/RoomDAO.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** RoomDAO.java 18 Mar 2008 19:41:32 -0000 1.18 --- RoomDAO.java 15 Nov 2010 01:27:30 -0000 1.19 *************** *** 26,33 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.Room; import org.oscarehr.PMmodule.model.RoomType; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 26,33 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.Room; import org.oscarehr.PMmodule.model.RoomType; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 37,41 **** public class RoomDAO extends HibernateDaoSupport { ! private static final Log log = LogFactory.getLog(RoomDAO.class); /** --- 37,41 ---- public class RoomDAO extends HibernateDaoSupport { ! private static final Logger log=MiscUtils.getLogger(); /** Index: RoomBedDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/RoomBedDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RoomBedDAO.java 18 Mar 2008 19:41:32 -0000 1.2 --- RoomBedDAO.java 15 Nov 2010 01:27:30 -0000 1.3 *************** *** 25,32 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.RoomBed; import org.oscarehr.PMmodule.model.RoomBedPK; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 25,32 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.RoomBed; import org.oscarehr.PMmodule.model.RoomBedPK; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 36,40 **** public class RoomBedDAO extends HibernateDaoSupport { ! private static final Log log = LogFactory.getLog(RoomBedDAO.class); /** --- 36,40 ---- public class RoomBedDAO extends HibernateDaoSupport { ! private static final Logger log=MiscUtils.getLogger(); /** Index: MergeClientDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/MergeClientDao.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MergeClientDao.java 13 Jan 2009 15:18:34 -0000 1.2 --- MergeClientDao.java 15 Nov 2010 01:27:30 -0000 1.3 *************** *** 2,21 **** - import java.util.ArrayList; import java.util.Iterator; import java.util.List; - import org.apache.commons.lang.StringEscapeUtils; - import org.hibernate.Criteria; - import org.hibernate.criterion.Expression; - import org.hibernate.criterion.LogicalExpression; - import org.hibernate.criterion.Restrictions; import org.oscarehr.PMmodule.model.ClientMerge; - import org.oscarehr.common.model.Demographic; - import org.oscarehr.PMmodule.web.formbean.ClientSearchFormBean; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - import com.quatro.common.KeyConstants; - public class MergeClientDao extends HibernateDaoSupport { --- 2,11 ---- Index: ProviderDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/ProviderDao.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ProviderDao.java 21 Jun 2010 16:44:39 -0000 1.24 --- ProviderDao.java 15 Nov 2010 01:27:30 -0000 1.25 *************** *** 26,31 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.hibernate.Criteria; import org.hibernate.Hibernate; --- 26,30 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.Hibernate; *************** *** 36,39 **** --- 35,39 ---- import org.hibernate.criterion.Restrictions; import org.oscarehr.common.model.Provider; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 42,46 **** public class ProviderDao extends HibernateDaoSupport { ! private static Log log = LogFactory.getLog(ProviderDao.class); public boolean providerExists(String providerNo) { --- 42,46 ---- public class ProviderDao extends HibernateDaoSupport { ! private static Logger log = MiscUtils.getLogger(); public boolean providerExists(String providerNo) { Index: ClientDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/ClientDao.java,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** ClientDao.java 16 Jul 2010 19:54:29 -0000 1.49 --- ClientDao.java 15 Nov 2010 01:27:30 -0000 1.50 *************** *** 31,35 **** import java.util.Date; import java.util.GregorianCalendar; - import java.util.HashSet; import java.util.List; import java.util.Map; --- 31,34 ---- *************** *** 37,48 **** import org.apache.commons.lang.StringEscapeUtils; - import org.apache.log4j.LogManager; - import org.apache.log4j.Logger; import org.apache.commons.lang.StringUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.hibernate.Criteria; import org.hibernate.HibernateException; - import org.hibernate.JDBCException; import org.hibernate.Query; import org.hibernate.criterion.DetachedCriteria; --- 36,43 ---- import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; ! import org.apache.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.criterion.DetachedCriteria; *************** *** 53,75 **** import org.hibernate.criterion.Restrictions; import org.oscarehr.PMmodule.model.Admission; import org.oscarehr.common.model.Demographic; import org.oscarehr.common.model.DemographicExt; - import org.oscarehr.PMmodule.model.ProgramProvider; import org.oscarehr.common.model.Provider; - import org.oscarehr.PMmodule.web.formbean.ClientListsReportFormBean; - import org.oscarehr.PMmodule.web.formbean.ClientSearchFormBean; import org.oscarehr.util.DbConnectionFilter; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; import oscar.MyDateFormat; - - import com.quatro.common.KeyConstants; - import com.quatro.util.Utility; - import oscar.OscarProperties; import oscar.util.SqlUtils; public class ClientDao extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(ClientDao.class); private static final int LIST_PROCESSING_CHUNK_SIZE=64; --- 48,66 ---- import org.hibernate.criterion.Restrictions; import org.oscarehr.PMmodule.model.Admission; + import org.oscarehr.PMmodule.web.formbean.ClientListsReportFormBean; + import org.oscarehr.PMmodule.web.formbean.ClientSearchFormBean; import org.oscarehr.common.model.Demographic; import org.oscarehr.common.model.DemographicExt; import org.oscarehr.common.model.Provider; import org.oscarehr.util.DbConnectionFilter; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; import oscar.MyDateFormat; import oscar.util.SqlUtils; public class ClientDao extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); private static final int LIST_PROCESSING_CHUNK_SIZE=64; Index: ProgramClientStatusDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/ProgramClientStatusDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ProgramClientStatusDAO.java 28 Sep 2007 18:55:33 -0000 1.2 --- ProgramClientStatusDAO.java 15 Nov 2010 01:27:30 -0000 1.3 *************** *** 25,37 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.hibernate.Query; import org.oscarehr.PMmodule.model.ProgramClientStatus; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class ProgramClientStatusDAO extends HibernateDaoSupport { ! private Log log = LogFactory.getLog(ProgramClientStatusDAO.class); public List<ProgramClientStatus> getProgramClientStatuses(Integer programId) { --- 25,37 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.hibernate.Query; import org.oscarehr.PMmodule.model.ProgramClientStatus; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class ProgramClientStatusDAO extends HibernateDaoSupport { ! private Logger log=MiscUtils.getLogger(); public List<ProgramClientStatus> getProgramClientStatuses(Integer programId) { Index: BedDemographicDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/dao/BedDemographicDao.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BedDemographicDao.java 17 Jun 2008 20:36:02 -0000 1.1 --- BedDemographicDao.java 15 Nov 2010 01:27:30 -0000 1.2 *************** *** 28,33 **** import org.apache.commons.lang.time.DateUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.BedDemographic; import org.oscarehr.PMmodule.model.BedDemographicHistorical; --- 28,32 ---- import org.apache.commons.lang.time.DateUtils; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.BedDemographic; import org.oscarehr.PMmodule.model.BedDemographicHistorical; *************** *** 35,38 **** --- 34,38 ---- import org.oscarehr.PMmodule.model.BedDemographicStatus; import org.oscarehr.PMmodule.utility.DateTimeFormatUtils; + import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 42,46 **** public class BedDemographicDao extends HibernateDaoSupport { ! private static final Log log = LogFactory.getLog(BedDemographicDao.class); public boolean bedDemographicStatusExists(Integer bedDemographicStatusId) { --- 42,46 ---- public class BedDemographicDao extends HibernateDaoSupport { ! private static final Logger log=MiscUtils.getLogger(); public boolean bedDemographicStatusExists(Integer bedDemographicStatusId) { |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/security In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/com/quatro/dao/security Modified Files: SecObjectNameDao.java SecSiteDao.java UserAccessDao.java Log Message: changed all commons logging to log4j logging Index: UserAccessDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/security/UserAccessDao.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** UserAccessDao.java 23 Jun 2009 18:35:38 -0000 1.4 --- UserAccessDao.java 15 Nov 2010 01:27:31 -0000 1.5 *************** *** 11,16 **** package com.quatro.dao.security; - import java.util.ArrayList; import java.util.List; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class UserAccessDao extends HibernateDaoSupport { --- 11,16 ---- package com.quatro.dao.security; import java.util.List; + import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class UserAccessDao extends HibernateDaoSupport { Index: SecObjectNameDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/security/SecObjectNameDao.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SecObjectNameDao.java 2 Jul 2010 18:46:09 -0000 1.2 --- SecObjectNameDao.java 15 Nov 2010 01:27:31 -0000 1.3 *************** *** 23,29 **** package com.quatro.dao.security; - import com.quatro.model.security.Secobjectname; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; /** * --- 23,30 ---- package com.quatro.dao.security; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; + import com.quatro.model.security.Secobjectname; + /** * Index: SecSiteDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/security/SecSiteDao.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SecSiteDao.java 23 Jun 2009 18:35:38 -0000 1.3 --- SecSiteDao.java 15 Nov 2010 01:27:31 -0000 1.4 *************** *** 11,20 **** package com.quatro.dao.security; - import java.util.ArrayList; import java.util.List; - import com.quatro.model.ReportValue; - import com.quatro.model.security.*; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; public class SecSiteDao extends HibernateDaoSupport { --- 11,19 ---- package com.quatro.dao.security; import java.util.List; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; + + import com.quatro.model.security.SecSiteValue; public class SecSiteDao extends HibernateDaoSupport { |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/reports In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/reports Modified Files: BasicReportAction.java ClientListsReportAction.java ActivityReportAction.java Log Message: changed all commons logging to log4j logging Index: BasicReportAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/reports/BasicReportAction.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** BasicReportAction.java 9 Jul 2010 14:48:48 -0000 1.9 --- BasicReportAction.java 15 Nov 2010 01:27:30 -0000 1.10 *************** *** 24,28 **** import java.util.Calendar; - import java.util.Date; import java.util.Iterator; import java.util.LinkedHashMap; --- 24,27 ---- Index: ClientListsReportAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/reports/ClientListsReportAction.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ClientListsReportAction.java 11 Sep 2008 22:51:33 -0000 1.11 --- ClientListsReportAction.java 15 Nov 2010 01:27:30 -0000 1.12 *************** *** 33,39 **** import org.oscarehr.PMmodule.dao.ClientDao; import org.oscarehr.PMmodule.model.Program; - import org.oscarehr.common.model.Provider; import org.oscarehr.PMmodule.service.ProgramManager; import org.oscarehr.PMmodule.service.ProviderManager; public class ClientListsReportAction extends DispatchAction { --- 33,39 ---- import org.oscarehr.PMmodule.dao.ClientDao; import org.oscarehr.PMmodule.model.Program; import org.oscarehr.PMmodule.service.ProgramManager; import org.oscarehr.PMmodule.service.ProviderManager; + import org.oscarehr.common.model.Provider; public class ClientListsReportAction extends DispatchAction { Index: ActivityReportAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/reports/ActivityReportAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ActivityReportAction.java 22 Jan 2009 23:04:14 -0000 1.7 --- ActivityReportAction.java 15 Nov 2010 01:27:30 -0000 1.8 *************** *** 32,37 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 32,36 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 46,52 **** import org.oscarehr.PMmodule.service.ProgramManager; import org.oscarehr.PMmodule.web.formbean.ActivityReportFormBean; public class ActivityReportAction extends DispatchAction { ! private static Log log = LogFactory.getLog(ActivityReportAction.class); private final SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); --- 45,52 ---- import org.oscarehr.PMmodule.service.ProgramManager; import org.oscarehr.PMmodule.web.formbean.ActivityReportFormBean; + import org.oscarehr.util.MiscUtils; public class ActivityReportAction extends DispatchAction { ! private static Logger log = MiscUtils.getLogger(); private final SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarDemographic/pageUtil Modified Files: DemographicExportAction2.java Util.java DemographicExportAction3.java DemographicExportAction.java ImportDemographicDataAction3.java DiabetesExportAction.java Log Message: changed all commons logging to log4j logging Index: DemographicExportAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/pageUtil/DemographicExportAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DemographicExportAction.java 22 Jul 2010 18:08:25 -0000 1.8 --- DemographicExportAction.java 15 Nov 2010 01:27:30 -0000 1.9 *************** *** 29,33 **** package oscar.oscarDemographic.pageUtil; - import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Hashtable; --- 29,32 ---- Index: DemographicExportAction2.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/pageUtil/DemographicExportAction2.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** DemographicExportAction2.java 22 Jul 2010 18:08:25 -0000 1.37 --- DemographicExportAction2.java 15 Nov 2010 01:27:30 -0000 1.38 *************** *** 40,44 **** import java.io.InputStream; import java.io.OutputStream; - import java.lang.reflect.Method; import java.math.BigInteger; import java.util.ArrayList; --- 40,43 ---- Index: ImportDemographicDataAction3.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/pageUtil/ImportDemographicDataAction3.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** ImportDemographicDataAction3.java 11 Nov 2010 01:35:11 -0000 1.41 --- ImportDemographicDataAction3.java 15 Nov 2010 01:27:30 -0000 1.42 *************** *** 55,60 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; --- 55,59 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; *************** *** 84,87 **** --- 83,87 ---- import oscar.oscarDemographic.data.DemographicExt; import oscar.oscarDemographic.data.DemographicRelationship; + import oscar.oscarDemographic.data.DemographicData.DemographicAddResult; import oscar.oscarEncounter.data.EctProgram; import oscar.oscarEncounter.oscarMeasurements.data.ImportExportMeasurements; *************** *** 95,98 **** --- 95,99 ---- import oscar.oscarRx.data.RxPrescriptionImport; import oscar.service.OscarSuperManager; + import oscar.util.StringUtils; import oscar.util.UtilDateUtilities; import cds.OmdCdsDocument; *************** *** 113,118 **** import cds.ReportsReceivedDocument.ReportsReceived; import cds.RiskFactorsDocument.RiskFactors; - import oscar.oscarDemographic.data.DemographicData.DemographicAddResult; - import oscar.util.StringUtils; /** --- 114,117 ---- *************** *** 122,126 **** public class ImportDemographicDataAction3 extends Action { ! Log logger = LogFactory.getLog(ImportDemographicDataAction3.class); boolean matchProviderNames = true; --- 121,125 ---- public class ImportDemographicDataAction3 extends Action { ! private static final Logger logger = MiscUtils.getLogger(); boolean matchProviderNames = true; Index: Util.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/pageUtil/Util.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Util.java 13 Aug 2010 17:11:37 -0000 1.15 --- Util.java 15 Nov 2010 01:27:30 -0000 1.16 *************** *** 23,28 **** import org.apache.xmlbeans.XmlCalendar; - import oscar.util.StringUtils; import org.oscarehr.util.MiscUtils; import oscar.util.UtilDateUtilities; --- 23,29 ---- import org.apache.xmlbeans.XmlCalendar; import org.oscarehr.util.MiscUtils; + + import oscar.util.StringUtils; import oscar.util.UtilDateUtilities; Index: DemographicExportAction3.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/pageUtil/DemographicExportAction3.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** DemographicExportAction3.java 13 Aug 2010 17:11:37 -0000 1.28 --- DemographicExportAction3.java 15 Nov 2010 01:27:30 -0000 1.29 *************** *** 92,95 **** --- 92,96 ---- import oscar.oscarRx.data.RxPrescriptionData; import oscar.service.OscarSuperManager; + import oscar.util.StringUtils; import oscar.util.UtilDateUtilities; import cds.OmdCdsDocument; *************** *** 109,113 **** import cds.ReportsReceivedDocument.ReportsReceived; import cds.RiskFactorsDocument.RiskFactors; - import oscar.util.StringUtils; /** --- 110,113 ---- Index: DiabetesExportAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/pageUtil/DiabetesExportAction.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** DiabetesExportAction.java 13 Aug 2010 17:11:37 -0000 1.19 --- DiabetesExportAction.java 15 Nov 2010 01:27:30 -0000 1.20 *************** *** 34,37 **** --- 34,38 ---- import org.oscarehr.dx.model.DxResearch; import org.oscarehr.util.MiscUtils; + import org.oscarehr.util.SpringUtils; import oscar.oscarDemographic.data.DemographicData; *************** *** 59,63 **** import cdsdiabetes.ProblemListDocument.ProblemList; import cdsdiabetes.ReportInformationDocument.ReportInformation; - import org.oscarehr.util.SpringUtils; --- 60,63 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil Modified Files: EctSaveEncounterAction.java EctIncomingEncounterAction.java EctDisplayDecisionSupportAlertsAction.java EctDisplayIssuesAction.java Log Message: changed all commons logging to log4j logging Index: EctIncomingEncounterAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctIncomingEncounterAction.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** EctIncomingEncounterAction.java 15 May 2010 22:10:52 -0000 1.17 --- EctIncomingEncounterAction.java 15 Nov 2010 01:27:30 -0000 1.18 *************** *** 32,41 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import oscar.util.UtilDateUtilities; --- 32,41 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; + import org.oscarehr.util.MiscUtils; import oscar.util.UtilDateUtilities; *************** *** 45,49 **** public class EctIncomingEncounterAction extends Action { ! private static Log log = LogFactory.getLog(EctIncomingEncounterAction.class); public ActionForward execute(ActionMapping mapping, --- 45,49 ---- public class EctIncomingEncounterAction extends Action { ! private static Logger log = MiscUtils.getLogger(); public ActionForward execute(ActionMapping mapping, Index: EctDisplayDecisionSupportAlertsAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayDecisionSupportAlertsAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EctDisplayDecisionSupportAlertsAction.java 11 Nov 2010 01:35:11 -0000 1.7 --- EctDisplayDecisionSupportAlertsAction.java 15 Nov 2010 01:27:30 -0000 1.8 *************** *** 13,23 **** import org.apache.commons.lang.StringEscapeUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.util.MessageResources; import org.oscarehr.decisionSupport.model.DSConsequence; import org.oscarehr.decisionSupport.model.DSGuideline; import org.oscarehr.decisionSupport.service.DSService; ! import org.oscarehr.decisionSupport.web.DSGuidelineAction; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; --- 13,22 ---- import org.apache.commons.lang.StringEscapeUtils; ! import org.apache.log4j.Logger; import org.apache.struts.util.MessageResources; import org.oscarehr.decisionSupport.model.DSConsequence; import org.oscarehr.decisionSupport.model.DSGuideline; import org.oscarehr.decisionSupport.service.DSService; ! import org.oscarehr.util.MiscUtils; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; *************** *** 32,36 **** public class EctDisplayDecisionSupportAlertsAction extends EctDisplayAction { private String cmd = "Guidelines"; ! private static Log _log = LogFactory.getLog(DSGuidelineAction.class); public boolean getInfo(EctSessionBean bean, HttpServletRequest request, NavBarDisplayDAO Dao, MessageResources messages) { --- 31,35 ---- public class EctDisplayDecisionSupportAlertsAction extends EctDisplayAction { private String cmd = "Guidelines"; ! private static final Logger logger = MiscUtils.getLogger(); public boolean getInfo(EctSessionBean bean, HttpServletRequest request, NavBarDisplayDAO Dao, MessageResources messages) { *************** *** 99,103 **** } } catch (Exception e) { ! _log.error("Unable to evaluate patient against a DS guideline '" + dsGuideline.getTitle() + "' of UUID '" + dsGuideline.getUuid() + "'", e); } } --- 98,102 ---- } } catch (Exception e) { ! logger.error("Unable to evaluate patient against a DS guideline '" + dsGuideline.getTitle() + "' of UUID '" + dsGuideline.getUuid() + "'", e); } } Index: EctSaveEncounterAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctSaveEncounterAction.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** EctSaveEncounterAction.java 7 Oct 2010 22:32:44 -0000 1.37 --- EctSaveEncounterAction.java 15 Nov 2010 01:27:30 -0000 1.38 *************** *** 35,40 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; --- 35,39 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; *************** *** 55,59 **** public class EctSaveEncounterAction extends Action { ! static Log log = LogFactory.getLog(EctSaveEncounterAction.class); private String getLatestID(String demoNo) throws --- 54,58 ---- public class EctSaveEncounterAction extends Action { ! static Logger log=MiscUtils.getLogger(); private String getLatestID(String demoNo) throws Index: EctDisplayIssuesAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/pageUtil/EctDisplayIssuesAction.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** EctDisplayIssuesAction.java 9 Jul 2010 21:37:15 -0000 1.17 --- EctDisplayIssuesAction.java 15 Nov 2010 01:27:30 -0000 1.18 *************** *** 30,35 **** import javax.servlet.http.HttpServletRequest; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.util.MessageResources; import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager; --- 30,34 ---- import javax.servlet.http.HttpServletRequest; ! import org.apache.log4j.Logger; import org.apache.struts.util.MessageResources; import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager; *************** *** 39,42 **** --- 38,42 ---- import org.oscarehr.casemgmt.service.CaseManagementManager; import org.oscarehr.util.LoggedInInfo; + import org.oscarehr.util.MiscUtils; import org.oscarehr.util.SpringUtils; *************** *** 52,56 **** private CaseManagementManager caseManagementMgr; ! private static Log log = LogFactory.getLog(EctDisplayIssuesAction.class); public void setCaseManagementManager(CaseManagementManager caseManagementMgr) { --- 52,56 ---- private CaseManagementManager caseManagementMgr; ! private static Logger log = MiscUtils.getLogger(); public void setCaseManagementManager(CaseManagementManager caseManagementMgr) { |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan Modified Files: TeleplanSequenceDAO.java WCBCodes.java TeleplanUserPassDAO.java TeleplanAPI.java TeleplanService.java TeleplanMessagesDAO.java WCBTeleplanSubmission.java TeleplanResponse.java Log Message: changed all commons logging to log4j logging Index: TeleplanMessagesDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan/TeleplanMessagesDAO.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TeleplanMessagesDAO.java 6 Oct 2010 08:03:20 -0000 1.5 --- TeleplanMessagesDAO.java 15 Nov 2010 01:27:31 -0000 1.6 *************** *** 32,37 **** import java.sql.ResultSet; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 32,36 ---- import java.sql.ResultSet; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 43,47 **** */ public class TeleplanMessagesDAO { ! static Log log = LogFactory.getLog(TeleplanSequenceDAO.class); /** Creates a new instance of TeleplanSequenceDAO */ --- 42,46 ---- */ public class TeleplanMessagesDAO { ! static Logger log=MiscUtils.getLogger(); /** Creates a new instance of TeleplanSequenceDAO */ Index: WCBCodes.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan/WCBCodes.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WCBCodes.java 9 Jul 2010 21:56:34 -0000 1.2 --- WCBCodes.java 15 Nov 2010 01:27:31 -0000 1.3 *************** *** 29,34 **** import org.apache.commons.lang.builder.ReflectionToStringBuilder; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import oscar.OscarProperties; --- 29,34 ---- import org.apache.commons.lang.builder.ReflectionToStringBuilder; ! import org.apache.log4j.Logger; ! import org.oscarehr.util.MiscUtils; import oscar.OscarProperties; *************** *** 40,44 **** public class WCBCodes { ! private static Log log = LogFactory.getLog(WCBCodes.class); private static WCBCodes wcbCodes = new WCBCodes(); String[] formRequiredCodes = null; --- 40,44 ---- public class WCBCodes { ! private static Logger log = MiscUtils.getLogger(); private static WCBCodes wcbCodes = new WCBCodes(); String[] formRequiredCodes = null; Index: WCBTeleplanSubmission.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan/WCBTeleplanSubmission.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** WCBTeleplanSubmission.java 11 Nov 2010 01:35:13 -0000 1.9 --- WCBTeleplanSubmission.java 15 Nov 2010 01:27:31 -0000 1.10 *************** *** 30,35 **** import java.util.Date; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.common.dao.DemographicDao; import org.oscarehr.common.model.Demographic; --- 30,34 ---- import java.util.Date; ! import org.apache.log4j.Logger; import org.oscarehr.common.dao.DemographicDao; import org.oscarehr.common.model.Demographic; *************** *** 45,49 **** */ public class WCBTeleplanSubmission { ! private static Log log = LogFactory.getLog(WCBTeleplanSubmission.class); private DemographicDao demographicDao = null; --- 44,48 ---- */ public class WCBTeleplanSubmission { ! private static Logger log = MiscUtils.getLogger(); private DemographicDao demographicDao = null; Index: TeleplanService.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan/TeleplanService.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TeleplanService.java 18 Mar 2008 19:41:26 -0000 1.3 --- TeleplanService.java 15 Nov 2010 01:27:31 -0000 1.4 *************** *** 34,39 **** import java.io.FileWriter; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; /** --- 34,39 ---- import java.io.FileWriter; ! import org.apache.log4j.Logger; ! import org.oscarehr.util.MiscUtils; /** *************** *** 42,46 **** */ public class TeleplanService { ! static Log log = LogFactory.getLog(TeleplanService.class); /** Creates a new instance of TeleplanService */ --- 42,46 ---- */ public class TeleplanService { ! static Logger log=MiscUtils.getLogger(); /** Creates a new instance of TeleplanService */ Index: TeleplanAPI.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan/TeleplanAPI.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TeleplanAPI.java 9 Jul 2010 21:56:34 -0000 1.5 --- TeleplanAPI.java 15 Nov 2010 01:27:31 -0000 1.6 *************** *** 44,49 **** import org.apache.commons.httpclient.methods.multipart.Part; import org.apache.commons.httpclient.methods.multipart.StringPart; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 44,48 ---- import org.apache.commons.httpclient.methods.multipart.Part; import org.apache.commons.httpclient.methods.multipart.StringPart; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 55,59 **** */ public class TeleplanAPI { ! static Log log = LogFactory.getLog(TeleplanAPI.class); public static String ExternalActionLogon = "AsignOn"; --- 54,58 ---- */ public class TeleplanAPI { ! static Logger log=MiscUtils.getLogger(); public static String ExternalActionLogon = "AsignOn"; Index: TeleplanUserPassDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan/TeleplanUserPassDAO.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TeleplanUserPassDAO.java 6 Oct 2010 08:03:20 -0000 1.5 --- TeleplanUserPassDAO.java 15 Nov 2010 01:27:31 -0000 1.6 *************** *** 32,37 **** import java.sql.ResultSet; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 32,36 ---- import java.sql.ResultSet; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 43,47 **** */ public class TeleplanUserPassDAO { ! static Log log = LogFactory.getLog(TeleplanUserPassDAO.class); /** Creates a new instance of TeleplanSequenceDAO */ --- 42,46 ---- */ public class TeleplanUserPassDAO { ! static Logger log=MiscUtils.getLogger(); /** Creates a new instance of TeleplanSequenceDAO */ Index: TeleplanResponse.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan/TeleplanResponse.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TeleplanResponse.java 9 Jul 2010 21:56:34 -0000 1.3 --- TeleplanResponse.java 15 Nov 2010 01:27:31 -0000 1.4 *************** *** 38,43 **** import java.io.InputStreamReader; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 38,42 ---- import java.io.InputStreamReader; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 49,53 **** */ public class TeleplanResponse { ! static Log log = LogFactory.getLog(TeleplanResponse.class); private String transactionNo = null; private String result = null; --- 48,52 ---- */ public class TeleplanResponse { ! static Logger log=MiscUtils.getLogger(); private String transactionNo = null; private String result = null; Index: TeleplanSequenceDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan/TeleplanSequenceDAO.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TeleplanSequenceDAO.java 6 Oct 2010 08:03:20 -0000 1.6 --- TeleplanSequenceDAO.java 15 Nov 2010 01:27:31 -0000 1.7 *************** *** 32,37 **** import java.sql.ResultSet; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 32,36 ---- import java.sql.ResultSet; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 43,47 **** */ public class TeleplanSequenceDAO { ! static Log log = LogFactory.getLog(TeleplanSequenceDAO.class); /** Creates a new instance of TeleplanSequenceDAO */ --- 42,46 ---- */ public class TeleplanSequenceDAO { ! static Logger log=MiscUtils.getLogger(); /** Creates a new instance of TeleplanSequenceDAO */ |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web Modified Files: IntakeCReport1Action.java HealthSafetyAction.java IntakeCAction2.java IntakeAction.java GenericIntakeSearchAction.java GenericIntakeReportAction.java CreateAnonymousClientAction.java IntakeAAction2.java IntakeAReport1Action.java IntakeCMentalHealthReportAction.java BaseGenericIntakeAction.java GenericIntakeEditAction.java OcanForm.java Log Message: changed all commons logging to log4j logging Index: IntakeAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/IntakeAction.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** IntakeAction.java 9 Jul 2010 21:56:35 -0000 1.18 --- IntakeAction.java 15 Nov 2010 01:27:30 -0000 1.19 *************** *** 28,33 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 28,32 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 40,47 **** import org.oscarehr.PMmodule.web.formbean.PreIntakeForm; import org.oscarehr.common.model.Demographic; public class IntakeAction extends BaseAction { ! private static Log log = LogFactory.getLog(IntakeAction.class); private ClientManager clientManager; private IntakeAManager intakeAManager; --- 39,47 ---- import org.oscarehr.PMmodule.web.formbean.PreIntakeForm; import org.oscarehr.common.model.Demographic; + import org.oscarehr.util.MiscUtils; public class IntakeAction extends BaseAction { ! private static Logger log = MiscUtils.getLogger(); private ClientManager clientManager; private IntakeAManager intakeAManager; Index: IntakeCReport1Action.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/IntakeCReport1Action.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** IntakeCReport1Action.java 16 Jul 2010 20:21:22 -0000 1.11 --- IntakeCReport1Action.java 15 Nov 2010 01:27:30 -0000 1.12 *************** *** 41,46 **** import javax.servlet.http.HttpSession; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 41,45 ---- import javax.servlet.http.HttpSession; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 59,63 **** */ public class IntakeCReport1Action extends BaseAction { ! private static Log log = LogFactory.getLog(IntakeCReport1Action.class); private IntakeCManager intakeCMgr = null; --- 58,62 ---- */ public class IntakeCReport1Action extends BaseAction { ! private static Logger log = MiscUtils.getLogger(); private IntakeCManager intakeCMgr = null; Index: OcanForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/OcanForm.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** OcanForm.java 9 Oct 2010 03:58:08 -0000 1.12 --- OcanForm.java 15 Nov 2010 01:27:30 -0000 1.13 *************** *** 3,7 **** import java.util.ArrayList; import java.util.HashMap; - import java.util.Iterator; import java.util.List; import java.util.Map; --- 3,6 ---- Index: GenericIntakeEditAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/GenericIntakeEditAction.java,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** GenericIntakeEditAction.java 12 Jul 2010 20:04:18 -0000 1.119 --- GenericIntakeEditAction.java 15 Nov 2010 01:27:30 -0000 1.120 *************** *** 36,41 **** import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.Globals; import org.apache.struts.action.ActionForm; --- 36,40 ---- import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; ! import org.apache.log4j.Logger; import org.apache.struts.Globals; import org.apache.struts.action.ActionForm; *************** *** 75,79 **** public class GenericIntakeEditAction extends BaseGenericIntakeAction { ! private static Log LOG = LogFactory.getLog(GenericIntakeEditAction.class); // Forwards private static final String EDIT = "edit"; --- 74,78 ---- public class GenericIntakeEditAction extends BaseGenericIntakeAction { ! private static Logger LOG = MiscUtils.getLogger(); // Forwards private static final String EDIT = "edit"; Index: IntakeCMentalHealthReportAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/IntakeCMentalHealthReportAction.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** IntakeCMentalHealthReportAction.java 9 Jul 2010 21:56:35 -0000 1.10 --- IntakeCMentalHealthReportAction.java 15 Nov 2010 01:27:30 -0000 1.11 *************** *** 41,46 **** import javax.servlet.http.HttpSession; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 41,45 ---- import javax.servlet.http.HttpSession; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 58,62 **** */ public class IntakeCMentalHealthReportAction extends BaseAction { ! private static Log log = LogFactory.getLog(IntakeCMentalHealthReportAction.class); private static final String SDF_PATTERN = "yyyy-MM-dd"; --- 57,61 ---- */ public class IntakeCMentalHealthReportAction extends BaseAction { ! private static Logger log = MiscUtils.getLogger(); private static final String SDF_PATTERN = "yyyy-MM-dd"; Index: CreateAnonymousClientAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/CreateAnonymousClientAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CreateAnonymousClientAction.java 23 Mar 2010 17:34:29 -0000 1.1 --- CreateAnonymousClientAction.java 15 Nov 2010 01:27:30 -0000 1.2 *************** *** 3,8 **** import java.util.Date; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.Program; import org.oscarehr.PMmodule.service.AdmissionManager; --- 3,7 ---- import java.util.Date; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.Program; import org.oscarehr.PMmodule.service.AdmissionManager; *************** *** 11,14 **** --- 10,14 ---- import org.oscarehr.common.model.Demographic; import org.oscarehr.util.LoggedInInfo; + import org.oscarehr.util.MiscUtils; import org.oscarehr.util.SpringUtils; *************** *** 26,30 **** public class CreateAnonymousClientAction { ! static Log logger = LogFactory.getLog(CreateAnonymousClientAction.class); public static Demographic generateAnonymousClient(int programId) { --- 26,30 ---- public class CreateAnonymousClientAction { ! private static Logger logger = MiscUtils.getLogger(); public static Demographic generateAnonymousClient(int programId) { Index: GenericIntakeReportAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/GenericIntakeReportAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GenericIntakeReportAction.java 9 Jun 2009 14:14:19 -0000 1.5 --- GenericIntakeReportAction.java 15 Nov 2010 01:27:30 -0000 1.6 *************** *** 12,17 **** import org.apache.commons.lang.StringUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 12,16 ---- import org.apache.commons.lang.StringUtils; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 19,26 **** import org.oscarehr.PMmodule.utility.DateTimeFormatUtils; import org.oscarehr.common.model.ReportStatistic; public class GenericIntakeReportAction extends BaseGenericIntakeAction { ! private static Log LOG = LogFactory.getLog(GenericIntakeReportAction.class); private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); --- 18,26 ---- import org.oscarehr.PMmodule.utility.DateTimeFormatUtils; import org.oscarehr.common.model.ReportStatistic; + import org.oscarehr.util.MiscUtils; public class GenericIntakeReportAction extends BaseGenericIntakeAction { ! private static Logger LOG = MiscUtils.getLogger(); private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); Index: GenericIntakeSearchAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/GenericIntakeSearchAction.java,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** GenericIntakeSearchAction.java 23 Jun 2010 17:04:33 -0000 1.73 --- GenericIntakeSearchAction.java 15 Nov 2010 01:27:30 -0000 1.74 *************** *** 32,37 **** import org.apache.commons.lang.StringUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 32,36 ---- import org.apache.commons.lang.StringUtils; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 62,66 **** public class GenericIntakeSearchAction extends BaseGenericIntakeAction { ! private static Log LOG = LogFactory.getLog(GenericIntakeSearchAction.class); private static final List<LookupCodeValue> genders = new ArrayList<LookupCodeValue>(); --- 61,65 ---- public class GenericIntakeSearchAction extends BaseGenericIntakeAction { ! private static Logger LOG = MiscUtils.getLogger(); private static final List<LookupCodeValue> genders = new ArrayList<LookupCodeValue>(); Index: BaseGenericIntakeAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/BaseGenericIntakeAction.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** BaseGenericIntakeAction.java 7 Dec 2008 16:54:50 -0000 1.17 --- BaseGenericIntakeAction.java 15 Nov 2010 01:27:30 -0000 1.18 *************** *** 5,10 **** import javax.servlet.http.HttpServletRequest; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.service.AdmissionManager; import org.oscarehr.PMmodule.service.AgencyManager; --- 5,9 ---- import javax.servlet.http.HttpServletRequest; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.service.AdmissionManager; import org.oscarehr.PMmodule.service.AgencyManager; *************** *** 27,30 **** --- 26,30 ---- import org.oscarehr.casemgmt.service.CaseManagementManager; import org.oscarehr.common.model.Demographic; + import org.oscarehr.util.MiscUtils; import com.quatro.service.LookupManager; *************** *** 32,36 **** abstract class BaseGenericIntakeAction extends BaseAction { ! private static Log LOG = LogFactory.getLog(BaseGenericIntakeAction.class); // Parameters --- 32,36 ---- abstract class BaseGenericIntakeAction extends BaseAction { ! private static Logger LOG = MiscUtils.getLogger(); // Parameters Index: IntakeAAction2.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/IntakeAAction2.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** IntakeAAction2.java 18 Oct 2010 01:17:29 -0000 1.20 --- IntakeAAction2.java 15 Nov 2010 01:27:30 -0000 1.21 *************** *** 32,37 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 32,36 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 53,59 **** import org.oscarehr.PMmodule.web.formbean.IntakeFormBean; import org.oscarehr.common.model.Demographic; public class IntakeAAction2 extends BaseAction { ! private static Log log = LogFactory.getLog(IntakeAAction2.class); private final SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd"); private AdmissionManager admissionManager; --- 52,59 ---- import org.oscarehr.PMmodule.web.formbean.IntakeFormBean; import org.oscarehr.common.model.Demographic; + import org.oscarehr.util.MiscUtils; public class IntakeAAction2 extends BaseAction { ! private static Logger log = MiscUtils.getLogger(); private final SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd"); private AdmissionManager admissionManager; Index: IntakeCAction2.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/IntakeCAction2.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** IntakeCAction2.java 9 Jul 2010 21:56:35 -0000 1.19 --- IntakeCAction2.java 15 Nov 2010 01:27:30 -0000 1.20 *************** *** 32,37 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 32,36 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 57,64 **** import org.oscarehr.PMmodule.web.formbean.IntakeFormBean; import org.oscarehr.common.model.Demographic; public class IntakeCAction2 extends BaseAction { ! private static final Log log = LogFactory.getLog(IntakeCAction2.class); private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy/MM/dd"); --- 56,64 ---- import org.oscarehr.PMmodule.web.formbean.IntakeFormBean; import org.oscarehr.common.model.Demographic; + import org.oscarehr.util.MiscUtils; public class IntakeCAction2 extends BaseAction { ! private static final Logger log = MiscUtils.getLogger(); private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy/MM/dd"); Index: IntakeAReport1Action.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/IntakeAReport1Action.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** IntakeAReport1Action.java 9 Jul 2010 21:56:35 -0000 1.12 --- IntakeAReport1Action.java 15 Nov 2010 01:27:30 -0000 1.13 *************** *** 35,40 **** import org.apache.commons.lang.StringUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 35,39 ---- import org.apache.commons.lang.StringUtils; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 48,54 **** import org.oscarehr.PMmodule.utility.Utility; import org.oscarehr.common.model.Demographic; public class IntakeAReport1Action extends BaseAction { ! private static Log log = LogFactory.getLog(IntakeAReport1Action.class); HttpSession session = null; --- 47,54 ---- import org.oscarehr.PMmodule.utility.Utility; import org.oscarehr.common.model.Demographic; + import org.oscarehr.util.MiscUtils; public class IntakeAReport1Action extends BaseAction { ! private static Logger log = MiscUtils.getLogger(); HttpSession session = null; Index: HealthSafetyAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/HealthSafetyAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** HealthSafetyAction.java 9 Jul 2010 21:56:35 -0000 1.5 --- HealthSafetyAction.java 15 Nov 2010 01:27:30 -0000 1.6 *************** *** 6,11 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 6,10 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 16,22 **** import org.oscarehr.PMmodule.service.HealthSafetyManager; import org.oscarehr.common.model.Provider; public class HealthSafetyAction extends DispatchAction { ! private static Log log = LogFactory.getLog(HealthSafetyAction.class); private HealthSafetyManager healthSafetyManager=null; --- 15,22 ---- import org.oscarehr.PMmodule.service.HealthSafetyManager; import org.oscarehr.common.model.Provider; + import org.oscarehr.util.MiscUtils; public class HealthSafetyAction extends DispatchAction { ! private static Logger log = MiscUtils.getLogger(); private HealthSafetyManager healthSafetyManager=null; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:08
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service Modified Files: BedManager.java GenericIntakeManager.java RoomManager.java Log Message: changed all commons logging to log4j logging Index: GenericIntakeManager.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service/GenericIntakeManager.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** GenericIntakeManager.java 7 Jul 2010 21:01:24 -0000 1.40 --- GenericIntakeManager.java 15 Nov 2010 01:27:30 -0000 1.41 *************** *** 34,39 **** import java.util.Map.Entry; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.dao.AdmissionDao; import org.oscarehr.PMmodule.dao.GenericIntakeDAO; --- 34,38 ---- import java.util.Map.Entry; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.dao.AdmissionDao; import org.oscarehr.PMmodule.dao.GenericIntakeDAO; *************** *** 53,56 **** --- 52,56 ---- import org.oscarehr.PMmodule.web.adapter.ocan.OcanXmlAdapterFactory; import org.oscarehr.common.model.ReportStatistic; + import org.oscarehr.util.MiscUtils; import org.springframework.transaction.annotation.Transactional; *************** *** 64,68 **** private OcanXmlAdapterFactory adapterFactory = new OcanXmlAdapterFactory(); ! Log logger = LogFactory.getLog(GenericIntakeManager.class); public void setGenericIntakeNodeDAO( --- 64,68 ---- private OcanXmlAdapterFactory adapterFactory = new OcanXmlAdapterFactory(); ! private static Logger logger = MiscUtils.getLogger(); public void setGenericIntakeNodeDAO( Index: RoomManager.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service/RoomManager.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** RoomManager.java 17 Feb 2009 20:13:41 -0000 1.32 --- RoomManager.java 15 Nov 2010 01:27:30 -0000 1.33 *************** *** 27,32 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.dao.BedDAO; import org.oscarehr.PMmodule.dao.ProgramDao; --- 27,31 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.dao.BedDAO; import org.oscarehr.PMmodule.dao.ProgramDao; *************** *** 39,42 **** --- 38,42 ---- import org.oscarehr.PMmodule.model.RoomDemographic; import org.oscarehr.PMmodule.model.RoomType; + import org.oscarehr.util.MiscUtils; import org.springframework.beans.factory.annotation.Required; import org.springframework.transaction.annotation.Transactional; *************** *** 48,52 **** public class RoomManager { ! private static final Log log = LogFactory.getLog(RoomManager.class); private static <T extends Exception> void handleException(T e) throws T { --- 48,52 ---- public class RoomManager { ! private static final Logger log=MiscUtils.getLogger(); private static <T extends Exception> void handleException(T e) throws T { Index: BedManager.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service/BedManager.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** BedManager.java 11 Nov 2010 01:35:13 -0000 1.28 --- BedManager.java 15 Nov 2010 01:27:30 -0000 1.29 *************** *** 27,32 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.dao.BedDAO; import org.oscarehr.PMmodule.dao.ProgramDao; --- 27,31 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.dao.BedDAO; import org.oscarehr.PMmodule.dao.ProgramDao; *************** *** 41,44 **** --- 40,44 ---- import org.oscarehr.PMmodule.model.Program; import org.oscarehr.PMmodule.model.Room; + import org.oscarehr.util.MiscUtils; import org.springframework.transaction.annotation.Transactional; *************** *** 49,53 **** public class BedManager { ! private static final Log log = LogFactory.getLog(BedManager.class); private static <T extends Exception> void handleException(T e) throws T { log.error(e); --- 49,53 ---- public class BedManager { ! private static final Logger log=MiscUtils.getLogger(); private static <T extends Exception> void handleException(T e) throws T { log.error(e); |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarDemographic Modified Files: PrintDemoLabelAction.java PrintDemoAddressLabelAction.java PrintDemoChartLabelAction.java Log Message: changed all commons logging to log4j logging Index: PrintDemoChartLabelAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/PrintDemoChartLabelAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PrintDemoChartLabelAction.java 11 Nov 2010 01:35:12 -0000 1.5 --- PrintDemoChartLabelAction.java 15 Nov 2010 01:27:30 -0000 1.6 *************** *** 13,18 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 13,17 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 26,30 **** public class PrintDemoChartLabelAction extends OscarAction { ! private static Log logger = LogFactory.getLog(PrintDemoChartLabelAction.class); --- 25,29 ---- public class PrintDemoChartLabelAction extends OscarAction { ! private static Logger logger = MiscUtils.getLogger(); Index: PrintDemoAddressLabelAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/PrintDemoAddressLabelAction.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PrintDemoAddressLabelAction.java 11 Nov 2010 01:35:12 -0000 1.12 --- PrintDemoAddressLabelAction.java 15 Nov 2010 01:27:30 -0000 1.13 *************** *** 12,17 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 12,16 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 26,30 **** public class PrintDemoAddressLabelAction extends OscarAction { ! private static Log logger = LogFactory.getLog(PrintDemoAddressLabelAction.class); public PrintDemoAddressLabelAction() { --- 25,29 ---- public class PrintDemoAddressLabelAction extends OscarAction { ! private static Logger logger = MiscUtils.getLogger(); public PrintDemoAddressLabelAction() { Index: PrintDemoLabelAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/PrintDemoLabelAction.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PrintDemoLabelAction.java 11 Nov 2010 01:35:12 -0000 1.10 --- PrintDemoLabelAction.java 15 Nov 2010 01:27:30 -0000 1.11 *************** *** 13,18 **** import javax.servlet.http.HttpServletResponse; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 13,17 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 26,30 **** public class PrintDemoLabelAction extends OscarAction { ! private static Log logger = LogFactory.getLog(PrintDemoLabelAction.class); public PrintDemoLabelAction() { --- 25,29 ---- public class PrintDemoLabelAction extends OscarAction { ! private static Logger logger = MiscUtils.getLogger(); public PrintDemoLabelAction() { |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/ocan/domain/staff Modified Files: C6PhysicalHealthHowWellDoYouFeelPhysicallyAreYouGettingAnyTreatmentForPhysical.java OCANStaffAssessment.java C11SafetyToOthersDoYouThinkYouCouldBeADangerToOtherPeopleSSafetyDoYouEver.java CComments.java C20BasicEducationDoYouHaveDifficultyInReadingWritingSpeakingOrUnderstandingEngl.java C7PsychoticSymptomsDoYouEverHearVoicesOrHaveProblemsWithYourThoughtsAreYouOn.java C9PsychologicalDistressHaveYouRecentlyFeltVerySadOrLowHaveYouFeltOverlyAnxious.java C16IntimateRelationshipsDoYouHaveAPartnerDoYouHaveProblemsInYourPartnershipMar.java CListOfAllCurrentMedicationsIncludingPrescribedAndAlternativeOverTheCounterMedicati.java C22TransportDoYouHaveAccessToTransportationDoYouHaveAccessToOtherAffordableTra.java C23MoneyHowDoYouFindBudgetingYourMoneyDoYouManageToPayYourBills.java C4SelfCareDoYouHaveProblemsKeepingCleanAndTidyDoYouEverNeedRemindingWhoBy.java C10SafetyToSelfDoYouEverHaveThoughtsOfHarmingYourselfOrActuallyHarmingYourself.java CMedicalConditionsCheckAllThatApply.java C2FoodWhatKindOfFoodFoYouEatAreYouAbleToPrepareYourOwnMealsAndDoYourOwnS.java C21TelephoneDoYouKnowHowToUseATelephoneIsItEasyToFindOneThatYouCanUse.java C3LookingAfterTheHomeAreYouAbleToLookAfterYourHomeDoesAnyoneHelpYou.java C19OtherDependentsDoYouHaveAnyDependentsOtherThanChildrenUnder18SuchAsAnElder.java COther.java C18ChildCareDoYouHaveAnyChildrenUnder18DoYouHaveAnyDifficultInLookingAfterT.java CSummaryOfActions.java ObjectFactory.java C5DaytimeActivitiesHowDoYouSpendYourDayDoYouHaveEnoughToDo.java CDescriptionOfSideEffectsCheckAllThatApply.java C15CompanyAreYouHappyWithYourSocialLifeDoYouWishYouHadMoreContactWithOthers.java C8InformationOnConditionAndTreatmentHaveYouBeenGivenClearInformationAboutYourMed.java C17SexualExpressionHowIsYourSexLife.java C14OtherAddictionsDoYouHaveAnAddictionIsYourAddictionAProblem.java C24BenefitsAreYouSureThatYouAreGettingAllTheMoneyThatYouAreEntitledTo.java C12AlcoholDoesDrinkingCauseYouAnyProblemsDoYouWishYouCouldCutDownOnYourDrink.java C13DrugsDoYouTakeDrugsThatArenTPrescribedAreThereAnyDrugsYouWouldFindHardTo.java CPsychiatricHistory.java CHowOftenDoYouDrinkAlcoholIENumberOfDrinks.java C1AccommodationWhatKindOfPlaceDoYouLiveInWhatSortOfPlaceIsIt.java CSummaryOfReferrals.java Log Message: changed all commons logging to log4j logging Index: C23MoneyHowDoYouFindBudgetingYourMoneyDoYouManageToPayYourBills.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C23MoneyHowDoYouFindBudgetingYourMoneyDoYouManageToPayYourBills.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C23MoneyHowDoYouFindBudgetingYourMoneyDoYouManageToPayYourBills.java 27 May 2009 07:26:32 -0000 1.1 --- C23MoneyHowDoYouFindBudgetingYourMoneyDoYouManageToPayYourBills.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C18ChildCareDoYouHaveAnyChildrenUnder18DoYouHaveAnyDifficultInLookingAfterT.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C18ChildCareDoYouHaveAnyChildrenUnder18DoYouHaveAnyDifficultInLookingAfterT.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C18ChildCareDoYouHaveAnyChildrenUnder18DoYouHaveAnyDifficultInLookingAfterT.java 27 May 2009 07:26:32 -0000 1.1 --- C18ChildCareDoYouHaveAnyChildrenUnder18DoYouHaveAnyDifficultInLookingAfterT.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C8InformationOnConditionAndTreatmentHaveYouBeenGivenClearInformationAboutYourMed.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C8InformationOnConditionAndTreatmentHaveYouBeenGivenClearInformationAboutYourMed.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C8InformationOnConditionAndTreatmentHaveYouBeenGivenClearInformationAboutYourMed.java 27 May 2009 07:26:32 -0000 1.1 --- C8InformationOnConditionAndTreatmentHaveYouBeenGivenClearInformationAboutYourMed.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C7PsychoticSymptomsDoYouEverHearVoicesOrHaveProblemsWithYourThoughtsAreYouOn.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C7PsychoticSymptomsDoYouEverHearVoicesOrHaveProblemsWithYourThoughtsAreYouOn.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C7PsychoticSymptomsDoYouEverHearVoicesOrHaveProblemsWithYourThoughtsAreYouOn.java 27 May 2009 07:26:32 -0000 1.1 --- C7PsychoticSymptomsDoYouEverHearVoicesOrHaveProblemsWithYourThoughtsAreYouOn.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 12,15 **** --- 12,16 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C16IntimateRelationshipsDoYouHaveAPartnerDoYouHaveProblemsInYourPartnershipMar.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C16IntimateRelationshipsDoYouHaveAPartnerDoYouHaveProblemsInYourPartnershipMar.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C16IntimateRelationshipsDoYouHaveAPartnerDoYouHaveProblemsInYourPartnershipMar.java 27 May 2009 07:26:32 -0000 1.1 --- C16IntimateRelationshipsDoYouHaveAPartnerDoYouHaveProblemsInYourPartnershipMar.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C14OtherAddictionsDoYouHaveAnAddictionIsYourAddictionAProblem.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C14OtherAddictionsDoYouHaveAnAddictionIsYourAddictionAProblem.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C14OtherAddictionsDoYouHaveAnAddictionIsYourAddictionAProblem.java 27 May 2009 07:26:32 -0000 1.1 --- C14OtherAddictionsDoYouHaveAnAddictionIsYourAddictionAProblem.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: CPsychiatricHistory.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/CPsychiatricHistory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CPsychiatricHistory.java 27 May 2009 07:26:32 -0000 1.1 --- CPsychiatricHistory.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: OCANStaffAssessment.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/OCANStaffAssessment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OCANStaffAssessment.java 27 May 2009 07:26:32 -0000 1.1 --- OCANStaffAssessment.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: CSummaryOfReferrals.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/CSummaryOfReferrals.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CSummaryOfReferrals.java 27 May 2009 07:26:32 -0000 1.1 --- CSummaryOfReferrals.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; Index: C22TransportDoYouHaveAccessToTransportationDoYouHaveAccessToOtherAffordableTra.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C22TransportDoYouHaveAccessToTransportationDoYouHaveAccessToOtherAffordableTra.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C22TransportDoYouHaveAccessToTransportationDoYouHaveAccessToOtherAffordableTra.java 27 May 2009 07:26:32 -0000 1.1 --- C22TransportDoYouHaveAccessToTransportationDoYouHaveAccessToOtherAffordableTra.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: CDescriptionOfSideEffectsCheckAllThatApply.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/CDescriptionOfSideEffectsCheckAllThatApply.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CDescriptionOfSideEffectsCheckAllThatApply.java 27 May 2009 07:26:32 -0000 1.1 --- CDescriptionOfSideEffectsCheckAllThatApply.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; Index: C17SexualExpressionHowIsYourSexLife.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C17SexualExpressionHowIsYourSexLife.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C17SexualExpressionHowIsYourSexLife.java 27 May 2009 07:26:32 -0000 1.1 --- C17SexualExpressionHowIsYourSexLife.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C5DaytimeActivitiesHowDoYouSpendYourDayDoYouHaveEnoughToDo.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C5DaytimeActivitiesHowDoYouSpendYourDayDoYouHaveEnoughToDo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C5DaytimeActivitiesHowDoYouSpendYourDayDoYouHaveEnoughToDo.java 27 May 2009 07:26:32 -0000 1.1 --- C5DaytimeActivitiesHowDoYouSpendYourDayDoYouHaveEnoughToDo.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: CListOfAllCurrentMedicationsIncludingPrescribedAndAlternativeOverTheCounterMedicati.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/CListOfAllCurrentMedicationsIncludingPrescribedAndAlternativeOverTheCounterMedicati.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CListOfAllCurrentMedicationsIncludingPrescribedAndAlternativeOverTheCounterMedicati.java 27 May 2009 07:26:32 -0000 1.1 --- CListOfAllCurrentMedicationsIncludingPrescribedAndAlternativeOverTheCounterMedicati.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; Index: C2FoodWhatKindOfFoodFoYouEatAreYouAbleToPrepareYourOwnMealsAndDoYourOwnS.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C2FoodWhatKindOfFoodFoYouEatAreYouAbleToPrepareYourOwnMealsAndDoYourOwnS.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C2FoodWhatKindOfFoodFoYouEatAreYouAbleToPrepareYourOwnMealsAndDoYourOwnS.java 27 May 2009 07:26:32 -0000 1.1 --- C2FoodWhatKindOfFoodFoYouEatAreYouAbleToPrepareYourOwnMealsAndDoYourOwnS.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C10SafetyToSelfDoYouEverHaveThoughtsOfHarmingYourselfOrActuallyHarmingYourself.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C10SafetyToSelfDoYouEverHaveThoughtsOfHarmingYourselfOrActuallyHarmingYourself.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C10SafetyToSelfDoYouEverHaveThoughtsOfHarmingYourselfOrActuallyHarmingYourself.java 27 May 2009 07:26:32 -0000 1.1 --- C10SafetyToSelfDoYouEverHaveThoughtsOfHarmingYourselfOrActuallyHarmingYourself.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: CComments.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/CComments.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CComments.java 27 May 2009 07:26:32 -0000 1.1 --- CComments.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 12,15 **** --- 12,16 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; Index: CHowOftenDoYouDrinkAlcoholIENumberOfDrinks.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/CHowOftenDoYouDrinkAlcoholIENumberOfDrinks.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CHowOftenDoYouDrinkAlcoholIENumberOfDrinks.java 27 May 2009 07:26:32 -0000 1.1 --- CHowOftenDoYouDrinkAlcoholIENumberOfDrinks.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C15CompanyAreYouHappyWithYourSocialLifeDoYouWishYouHadMoreContactWithOthers.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C15CompanyAreYouHappyWithYourSocialLifeDoYouWishYouHadMoreContactWithOthers.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C15CompanyAreYouHappyWithYourSocialLifeDoYouWishYouHadMoreContactWithOthers.java 27 May 2009 07:26:32 -0000 1.1 --- C15CompanyAreYouHappyWithYourSocialLifeDoYouWishYouHadMoreContactWithOthers.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C20BasicEducationDoYouHaveDifficultyInReadingWritingSpeakingOrUnderstandingEngl.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C20BasicEducationDoYouHaveDifficultyInReadingWritingSpeakingOrUnderstandingEngl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C20BasicEducationDoYouHaveDifficultyInReadingWritingSpeakingOrUnderstandingEngl.java 27 May 2009 07:26:32 -0000 1.1 --- C20BasicEducationDoYouHaveDifficultyInReadingWritingSpeakingOrUnderstandingEngl.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: CSummaryOfActions.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/CSummaryOfActions.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CSummaryOfActions.java 27 May 2009 07:26:32 -0000 1.1 --- CSummaryOfActions.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 13,16 **** --- 13,17 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; Index: C19OtherDependentsDoYouHaveAnyDependentsOtherThanChildrenUnder18SuchAsAnElder.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C19OtherDependentsDoYouHaveAnyDependentsOtherThanChildrenUnder18SuchAsAnElder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C19OtherDependentsDoYouHaveAnyDependentsOtherThanChildrenUnder18SuchAsAnElder.java 27 May 2009 07:26:32 -0000 1.1 --- C19OtherDependentsDoYouHaveAnyDependentsOtherThanChildrenUnder18SuchAsAnElder.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: ObjectFactory.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/ObjectFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ObjectFactory.java 27 May 2009 07:26:32 -0000 1.1 --- ObjectFactory.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementDecl; Index: C3LookingAfterTheHomeAreYouAbleToLookAfterYourHomeDoesAnyoneHelpYou.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C3LookingAfterTheHomeAreYouAbleToLookAfterYourHomeDoesAnyoneHelpYou.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C3LookingAfterTheHomeAreYouAbleToLookAfterYourHomeDoesAnyoneHelpYou.java 27 May 2009 07:26:32 -0000 1.1 --- C3LookingAfterTheHomeAreYouAbleToLookAfterYourHomeDoesAnyoneHelpYou.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: CMedicalConditionsCheckAllThatApply.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/CMedicalConditionsCheckAllThatApply.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CMedicalConditionsCheckAllThatApply.java 27 May 2009 07:26:32 -0000 1.1 --- CMedicalConditionsCheckAllThatApply.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; Index: C24BenefitsAreYouSureThatYouAreGettingAllTheMoneyThatYouAreEntitledTo.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C24BenefitsAreYouSureThatYouAreGettingAllTheMoneyThatYouAreEntitledTo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C24BenefitsAreYouSureThatYouAreGettingAllTheMoneyThatYouAreEntitledTo.java 27 May 2009 07:26:32 -0000 1.1 --- C24BenefitsAreYouSureThatYouAreGettingAllTheMoneyThatYouAreEntitledTo.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C9PsychologicalDistressHaveYouRecentlyFeltVerySadOrLowHaveYouFeltOverlyAnxious.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C9PsychologicalDistressHaveYouRecentlyFeltVerySadOrLowHaveYouFeltOverlyAnxious.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C9PsychologicalDistressHaveYouRecentlyFeltVerySadOrLowHaveYouFeltOverlyAnxious.java 27 May 2009 07:26:32 -0000 1.1 --- C9PsychologicalDistressHaveYouRecentlyFeltVerySadOrLowHaveYouFeltOverlyAnxious.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C21TelephoneDoYouKnowHowToUseATelephoneIsItEasyToFindOneThatYouCanUse.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C21TelephoneDoYouKnowHowToUseATelephoneIsItEasyToFindOneThatYouCanUse.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C21TelephoneDoYouKnowHowToUseATelephoneIsItEasyToFindOneThatYouCanUse.java 27 May 2009 07:26:32 -0000 1.1 --- C21TelephoneDoYouKnowHowToUseATelephoneIsItEasyToFindOneThatYouCanUse.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C11SafetyToOthersDoYouThinkYouCouldBeADangerToOtherPeopleSSafetyDoYouEver.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C11SafetyToOthersDoYouThinkYouCouldBeADangerToOtherPeopleSSafetyDoYouEver.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C11SafetyToOthersDoYouThinkYouCouldBeADangerToOtherPeopleSSafetyDoYouEver.java 27 May 2009 07:26:32 -0000 1.1 --- C11SafetyToOthersDoYouThinkYouCouldBeADangerToOtherPeopleSSafetyDoYouEver.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: COther.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/COther.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** COther.java 27 May 2009 07:26:32 -0000 1.1 --- COther.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 12,15 **** --- 12,16 ---- import java.util.ArrayList; import java.util.List; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; Index: C6PhysicalHealthHowWellDoYouFeelPhysicallyAreYouGettingAnyTreatmentForPhysical.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C6PhysicalHealthHowWellDoYouFeelPhysicallyAreYouGettingAnyTreatmentForPhysical.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C6PhysicalHealthHowWellDoYouFeelPhysicallyAreYouGettingAnyTreatmentForPhysical.java 27 May 2009 07:26:32 -0000 1.1 --- C6PhysicalHealthHowWellDoYouFeelPhysicallyAreYouGettingAnyTreatmentForPhysical.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C1AccommodationWhatKindOfPlaceDoYouLiveInWhatSortOfPlaceIsIt.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C1AccommodationWhatKindOfPlaceDoYouLiveInWhatSortOfPlaceIsIt.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C1AccommodationWhatKindOfPlaceDoYouLiveInWhatSortOfPlaceIsIt.java 27 May 2009 07:26:32 -0000 1.1 --- C1AccommodationWhatKindOfPlaceDoYouLiveInWhatSortOfPlaceIsIt.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C12AlcoholDoesDrinkingCauseYouAnyProblemsDoYouWishYouCouldCutDownOnYourDrink.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C12AlcoholDoesDrinkingCauseYouAnyProblemsDoYouWishYouCouldCutDownOnYourDrink.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C12AlcoholDoesDrinkingCauseYouAnyProblemsDoYouWishYouCouldCutDownOnYourDrink.java 27 May 2009 07:26:32 -0000 1.1 --- C12AlcoholDoesDrinkingCauseYouAnyProblemsDoYouWishYouCouldCutDownOnYourDrink.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C13DrugsDoYouTakeDrugsThatArenTPrescribedAreThereAnyDrugsYouWouldFindHardTo.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C13DrugsDoYouTakeDrugsThatArenTPrescribedAreThereAnyDrugsYouWouldFindHardTo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C13DrugsDoYouTakeDrugsThatArenTPrescribedAreThereAnyDrugsYouWouldFindHardTo.java 27 May 2009 07:26:32 -0000 1.1 --- C13DrugsDoYouTakeDrugsThatArenTPrescribedAreThereAnyDrugsYouWouldFindHardTo.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Index: C4SelfCareDoYouHaveProblemsKeepingCleanAndTidyDoYouEverNeedRemindingWhoBy.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/domain/staff/C4SelfCareDoYouHaveProblemsKeepingCleanAndTidyDoYouEverNeedRemindingWhoBy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** C4SelfCareDoYouHaveProblemsKeepingCleanAndTidyDoYouEverNeedRemindingWhoBy.java 27 May 2009 07:26:32 -0000 1.1 --- C4SelfCareDoYouHaveProblemsKeepingCleanAndTidyDoYouEverNeedRemindingWhoBy.java 15 Nov 2010 01:27:29 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- import java.math.BigInteger; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; |
