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
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21088/web/dms Modified Files: documentReport.jsp addedithtmldocument.jsp html5AddDocuments.jsp previewDocHL7Inbox.jsp editDocument.jsp addDocument.jsp Log Message: removed a slew of superfluous tags Index: addDocument.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/addDocument.jsp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** addDocument.jsp 4 Nov 2010 06:25:16 -0000 1.16 --- addDocument.jsp 15 Nov 2010 03:26:18 -0000 1.17 *************** *** 1,4 **** - <%@page contentType="text/html"%> - <%@page pageEncoding="ISO-8859-1"%> <%-- /* --- 1,2 ---- Index: previewDocHL7Inbox.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/previewDocHL7Inbox.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** previewDocHL7Inbox.jsp 20 Sep 2010 19:43:17 -0000 1.3 --- previewDocHL7Inbox.jsp 15 Nov 2010 03:26:18 -0000 1.4 *************** *** 1,3 **** - <%@page contentType="text/html" pageEncoding="ISO-8859-1"%> <!-- /* --- 1,2 ---- Index: editDocument.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/editDocument.jsp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** editDocument.jsp 15 May 2010 22:10:51 -0000 1.14 --- editDocument.jsp 15 Nov 2010 03:26:18 -0000 1.15 *************** *** 37,47 **** scope="page" /> <%@ page ! import="java.util.*, java.io.*, java.sql.*, oscar.*, oscar.util.*, java.net.*,oscar.MyDateFormat, oscar.dms.*, oscar.dms.data.*, oscar.oscarProvider.data.ProviderData"%> ! ! ! <%@page contentType="text/html"%> ! <%@page pageEncoding="ISO-8859-1"%> ! ! <% String editDocumentNo = ""; if (request.getAttribute("editDocumentNo") != null) { --- 37,41 ---- scope="page" /> <%@ page ! import="java.util.*, java.io.*, java.sql.*, oscar.*, oscar.util.*, java.net.*,oscar.MyDateFormat, oscar.dms.*, oscar.dms.data.*, oscar.oscarProvider.data.ProviderData"%><% String editDocumentNo = ""; if (request.getAttribute("editDocumentNo") != null) { Index: html5AddDocuments.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/html5AddDocuments.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** html5AddDocuments.jsp 26 Jul 2010 21:03:57 -0000 1.4 --- html5AddDocuments.jsp 15 Nov 2010 03:26:18 -0000 1.5 *************** *** 7,11 **** */ --> ! <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page import="oscar.dms.data.*,oscar.oscarProvider.data.*,java.util.*,oscar.oscarLab.ca.on.CommonLabResultData,org.oscarehr.util.SpringUtils,org.oscarehr.common.dao.QueueDao" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> --- 7,11 ---- */ --> ! <%@page pageEncoding="UTF-8"%> <%@page import="oscar.dms.data.*,oscar.oscarProvider.data.*,java.util.*,oscar.oscarLab.ca.on.CommonLabResultData,org.oscarehr.util.SpringUtils,org.oscarehr.common.dao.QueueDao" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> Index: addedithtmldocument.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/addedithtmldocument.jsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** addedithtmldocument.jsp 15 May 2010 22:10:51 -0000 1.13 --- addedithtmldocument.jsp 15 Nov 2010 03:26:18 -0000 1.14 *************** *** 37,46 **** scope="page" /> <%@ page ! import="java.util.*, oscar.*, oscar.util.*, oscar.dms.*, oscar.dms.data.*, oscar.oscarProvider.data.ProviderData"%> ! ! <%@page contentType="text/html"%> ! <%@page pageEncoding="ISO-8859-1"%> ! ! <% String mode = ""; if (request.getAttribute("mode") != null) { --- 37,41 ---- scope="page" /> <%@ page ! import="java.util.*, oscar.*, oscar.util.*, oscar.dms.*, oscar.dms.data.*, oscar.oscarProvider.data.ProviderData"%><% String mode = ""; if (request.getAttribute("mode") != null) { Index: documentReport.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/documentReport.jsp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** documentReport.jsp 4 Nov 2010 06:25:16 -0000 1.51 --- documentReport.jsp 15 Nov 2010 03:26:18 -0000 1.52 *************** *** 1,3 **** - <%@page contentType="text/html" pageEncoding="ISO-8859-1"%> <!-- /* --- 1,2 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 03:26:26
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/ticklerPlus In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21088/web/ticklerPlus Modified Files: Error.jsp Log Message: removed a slew of superfluous tags Index: Error.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/ticklerPlus/Error.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Error.jsp 22 Jul 2010 18:08:26 -0000 1.6 --- Error.jsp 15 Nov 2010 03:26:18 -0000 1.7 *************** *** 1,4 **** <%@ include file="/ticklerPlus/taglibs.jsp"%> ! <%@ page language="java" isErrorPage="true"%> --- 1,4 ---- <%@ include file="/ticklerPlus/taglibs.jsp"%> ! <%@page isErrorPage="true"%> |
|
From: Ted L. <ted...@us...> - 2010-11-15 03:26:26
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/config In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21088/web/oscarMessenger/config Modified Files: MessengerAdmin.jsp MessengerCreateGroup.jsp Log Message: removed a slew of superfluous tags Index: MessengerAdmin.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/config/MessengerAdmin.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MessengerAdmin.jsp 7 Jul 2010 21:01:32 -0000 1.9 --- MessengerAdmin.jsp 15 Nov 2010 03:26:18 -0000 1.10 *************** *** 24,29 **** */ --%> - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- Index: MessengerCreateGroup.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/config/MessengerCreateGroup.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MessengerCreateGroup.jsp 15 May 2010 22:11:07 -0000 1.7 --- MessengerCreateGroup.jsp 15 Nov 2010 03:26:18 -0000 1.8 *************** *** 24,30 **** */ --%> - - - <%@ page language="java"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> --- 24,27 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 03:08:08
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/study In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13658/web/WEB-INF/classes/src/oscar/form/study Modified Files: FrmStudyXMLClientSend.java Log Message: removed some comments Index: FrmStudyXMLClientSend.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/study/FrmStudyXMLClientSend.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** FrmStudyXMLClientSend.java 6 Oct 2010 21:52:11 -0000 1.15 --- FrmStudyXMLClientSend.java 15 Nov 2010 03:07:56 -0000 1.16 *************** *** 137,147 **** private void sendJaxmMsg (String aMsg, String u) throws java.sql.SQLException { try { - //System.setProperty("javax.net.ssl.trustStore", "c:\\root\\oscarComm\\oscarComm.keystore"); - //System.setProperty("javax.net.ssl.trustStore", "/root/oscarComm/compete.keystore"); System.setProperty("javax.net.ssl.trustStore", u); - //System.setProperty("javax.net.debug", "ssl,handshake,trustmanager"); - //URL endPoint = new URL (" https://67.69.12.115:8443"); - //javax.xml.soap.SOAPConnectionFactory=com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory SOAPConnectionFactory scf = SOAPConnectionFactory.newInstance(); SOAPConnection connection = scf.createConnection(); --- 137,142 ---- *************** *** 158,162 **** SOAPHeaderElement headerElement = header.addHeaderElement(envelope.createName("OSCAR", "DT", "http://www.oscarhome.org/")); headerElement.addTextNode("header"); - //SOAPBodyElement bodyElement = body.addBodyElement(envelope.createName("Text", "jaxm", "http://java.sun.com/jaxm")); SOAPBodyElement bodyElement = body.addBodyElement(envelope.createName("Service")); --- 153,156 ---- *************** *** 165,177 **** AttachmentPart ap1 = message.createAttachmentPart(); ap1.setContent(aMsg, "text/plain"); - //DOMSource aSource = new DOMSource(UtilXML.parseXML(aMsg) ); - //ap1.setContent(aSource, "text/xml"); - //URL url = new URL("../../../../webapps/oscar_sfhc/images/sfhc.jpg"); - //AttachmentPart ap1 = message.createAttachmentPart(new DataHandler(url)); - //message.addAttachmentPart(ap1); message.addAttachmentPart(ap1); - - //AttachmentPart ap2 = message.createAttachmentPart("hello", "text/plain; charset=ISO-8859-1"); //message.addAttachmentPart(ap2); URLEndpoint endPoint = new URLEndpoint (URLService); //"https://67.69.12.115:8443/OscarComm/DummyReceiver"); --- 159,164 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:34:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3181/build Modified Files: grep_check_web.data Log Message: updated baseline for no commons logging Index: grep_check_web.data =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/grep_check_web.data,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvscS4S79 and /tmp/cvsMVWMYX differ |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/dms Modified Files: EDocUtil.java EDoc.java Log Message: changed all commons logging to log4j logging Index: EDoc.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/EDoc.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** EDoc.java 4 Nov 2010 06:25:16 -0000 1.23 --- EDoc.java 15 Nov 2010 01:27:36 -0000 1.24 *************** *** 32,37 **** import org.apache.commons.io.FileUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.upload.FormFile; import org.oscarehr.util.MiscUtils; --- 32,36 ---- import org.apache.commons.io.FileUtils; ! import org.apache.log4j.Logger; import org.apache.struts.upload.FormFile; import org.oscarehr.util.MiscUtils; *************** *** 42,46 **** public class EDoc extends TagObject implements Comparable { ! private static Log _log = LogFactory.getLog(EDoc.class); private String docId; --- 41,45 ---- public class EDoc extends TagObject implements Comparable { ! private static final Logger logger = MiscUtils.getLogger(); private String docId; *************** *** 150,154 **** os = new FileOutputStream(getFilePath()); } catch (FileNotFoundException fnfe) { ! _log.error("Could not write to the document container", fnfe); throw fnfe; } --- 149,153 ---- os = new FileOutputStream(getFilePath()); } catch (FileNotFoundException fnfe) { ! logger.error("Could not write to the document container", fnfe); throw fnfe; } Index: EDocUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dms/EDocUtil.java,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** EDocUtil.java 11 Nov 2010 01:35:16 -0000 1.69 --- EDocUtil.java 15 Nov 2010 01:27:36 -0000 1.70 *************** *** 36,41 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.service.ProgramManager; import org.oscarehr.casemgmt.dao.CaseManagementNoteLinkDAO; --- 36,40 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.service.ProgramManager; import org.oscarehr.casemgmt.dao.CaseManagementNoteLinkDAO; *************** *** 54,58 **** // all SQL statements here public final class EDocUtil extends SqlUtilBaseS { ! static Log log = LogFactory.getLog(EDocUtil.class); public static final String PUBLIC = "public"; --- 53,57 ---- // all SQL statements here public final class EDocUtil extends SqlUtilBaseS { ! static Logger log=MiscUtils.getLogger(); public static final String PUBLIC = "public"; |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil Modified Files: MsgHandleMessagesAction.java MsgSendMessageAction.java MsgViewMessageAction.java Log Message: changed all commons logging to log4j logging Index: MsgHandleMessagesAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgHandleMessagesAction.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** MsgHandleMessagesAction.java 11 Nov 2010 01:35:11 -0000 1.25 --- MsgHandleMessagesAction.java 15 Nov 2010 01:27:36 -0000 1.26 *************** *** 25,29 **** package oscar.oscarMessenger.pageUtil; import java.io.IOException; - import java.util.Locale; import javax.servlet.ServletException; --- 25,28 ---- *************** *** 36,40 **** import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; - import org.apache.struts.util.MessageResources; import org.oscarehr.util.MiscUtils; --- 35,38 ---- Index: MsgViewMessageAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgViewMessageAction.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** MsgViewMessageAction.java 6 Oct 2010 21:52:12 -0000 1.26 --- MsgViewMessageAction.java 15 Nov 2010 01:27:36 -0000 1.27 *************** *** 25,29 **** package oscar.oscarMessenger.pageUtil; import java.io.IOException; - import java.util.Locale; import java.util.Vector; --- 25,28 ---- *************** *** 36,40 **** import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; - import org.apache.struts.util.MessageResources; import org.oscarehr.util.MiscUtils; --- 35,38 ---- Index: MsgSendMessageAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgSendMessageAction.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** MsgSendMessageAction.java 11 Nov 2010 01:35:11 -0000 1.21 --- MsgSendMessageAction.java 15 Nov 2010 01:27:36 -0000 1.22 *************** *** 25,29 **** package oscar.oscarMessenger.pageUtil; import java.io.IOException; - import java.util.Locale; import javax.servlet.ServletException; --- 25,28 ---- *************** *** 36,40 **** import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessages; - import org.apache.struts.util.MessageResources; import org.oscarehr.util.MiscUtils; --- 35,38 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarSurveillance In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarSurveillance Modified Files: SurveillanceAnswerAction.java CheckSurveillanceForm.java Survey.java SurveillanceMaster.java CheckSurveillanceAction.java ProcessSurveyFile.java SurveyInfo.java Log Message: changed all commons logging to log4j logging Index: Survey.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarSurveillance/Survey.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Survey.java 6 Oct 2010 21:52:13 -0000 1.14 --- Survey.java 15 Nov 2010 01:27:35 -0000 1.15 *************** *** 39,44 **** import java.util.Random; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 39,43 ---- import java.util.Random; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 50,54 **** */ public class Survey { ! private static Log log = LogFactory.getLog(Survey.class); static long seed = 0; --- 49,53 ---- */ public class Survey { ! private static Logger log = MiscUtils.getLogger(); static long seed = 0; Index: SurveyInfo.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarSurveillance/SurveyInfo.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SurveyInfo.java 18 Mar 2008 19:41:40 -0000 1.3 --- SurveyInfo.java 15 Nov 2010 01:27:35 -0000 1.4 *************** *** 33,38 **** import java.util.Date; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import oscar.OscarProperties; --- 33,38 ---- import java.util.Date; ! import org.apache.log4j.Logger; ! import org.oscarehr.util.MiscUtils; import oscar.OscarProperties; *************** *** 43,47 **** */ public class SurveyInfo { ! private static Log log = LogFactory.getLog(SurveyInfo.class); /** Creates a new instance of SurveyInfo */ --- 43,47 ---- */ public class SurveyInfo { ! private static Logger log = MiscUtils.getLogger(); /** Creates a new instance of SurveyInfo */ Index: SurveillanceAnswerAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarSurveillance/SurveillanceAnswerAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SurveillanceAnswerAction.java 18 Mar 2008 19:41:39 -0000 1.5 --- SurveillanceAnswerAction.java 15 Nov 2010 01:27:35 -0000 1.6 *************** *** 39,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; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; /** --- 39,48 ---- 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; /** *************** *** 51,55 **** */ public class SurveillanceAnswerAction extends Action { ! private static Log log = LogFactory.getLog(SurveillanceAnswerAction.class); /** Creates a new instance of SurveillanceAnswerAction */ public SurveillanceAnswerAction() { --- 51,55 ---- */ public class SurveillanceAnswerAction extends Action { ! private static Logger log = MiscUtils.getLogger(); /** Creates a new instance of SurveillanceAnswerAction */ public SurveillanceAnswerAction() { Index: CheckSurveillanceAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarSurveillance/CheckSurveillanceAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CheckSurveillanceAction.java 3 Jul 2010 01:27:03 -0000 1.8 --- CheckSurveillanceAction.java 15 Nov 2010 01:27:35 -0000 1.9 *************** *** 40,49 **** 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; --- 40,49 ---- 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; *************** *** 53,57 **** */ public class CheckSurveillanceAction extends Action { ! private static Log log = LogFactory.getLog(CheckSurveillanceAction.class); /** Creates a new instance of checkSurveillanceAction */ --- 53,57 ---- */ public class CheckSurveillanceAction extends Action { ! private static Logger log = MiscUtils.getLogger(); /** Creates a new instance of checkSurveillanceAction */ Index: ProcessSurveyFile.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarSurveillance/ProcessSurveyFile.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ProcessSurveyFile.java 6 Oct 2010 21:52:13 -0000 1.12 --- ProcessSurveyFile.java 15 Nov 2010 01:27:35 -0000 1.13 *************** *** 35,40 **** import java.sql.SQLException; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 35,39 ---- import java.sql.SQLException; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 47,51 **** */ public class ProcessSurveyFile{ ! private static Log log = LogFactory.getLog(ProcessSurveyFile.class); --- 46,50 ---- */ public class ProcessSurveyFile{ ! private static Logger log = MiscUtils.getLogger(); Index: SurveillanceMaster.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarSurveillance/SurveillanceMaster.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SurveillanceMaster.java 22 Jul 2010 18:08:28 -0000 1.8 --- SurveillanceMaster.java 15 Nov 2010 01:27:35 -0000 1.9 *************** *** 36,41 **** import org.apache.commons.digester.Digester; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.xml.sax.SAXException; --- 36,41 ---- import org.apache.commons.digester.Digester; ! import org.apache.log4j.Logger; ! import org.oscarehr.util.MiscUtils; import org.xml.sax.SAXException; *************** *** 47,51 **** */ public class SurveillanceMaster { ! private static Log log = LogFactory.getLog(SurveillanceMaster.class); static SurveillanceMaster surveillanceMaster = new SurveillanceMaster(); --- 47,51 ---- */ public class SurveillanceMaster { ! private static Logger log = MiscUtils.getLogger(); static SurveillanceMaster surveillanceMaster = new SurveillanceMaster(); Index: CheckSurveillanceForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarSurveillance/CheckSurveillanceForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CheckSurveillanceForm.java 18 Mar 2008 19:41:40 -0000 1.3 --- CheckSurveillanceForm.java 15 Nov 2010 01:27:35 -0000 1.4 *************** *** 32,38 **** ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; /** --- 32,38 ---- ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; + import org.oscarehr.util.MiscUtils; /** *************** *** 41,45 **** */ public class CheckSurveillanceForm extends ActionForm { ! private static Log log = LogFactory.getLog(CheckSurveillanceForm.class); String proceed =null; --- 41,45 ---- */ public class CheckSurveillanceForm extends ActionForm { ! private static Logger log = MiscUtils.getLogger(); String proceed =null; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/adapter In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/adapter Modified Files: AnswerScalarTextHtmlAdapter.java Log Message: changed all commons logging to log4j logging Index: AnswerScalarTextHtmlAdapter.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/adapter/AnswerScalarTextHtmlAdapter.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AnswerScalarTextHtmlAdapter.java 2 Sep 2009 20:58:49 -0000 1.10 --- AnswerScalarTextHtmlAdapter.java 15 Nov 2010 01:27:32 -0000 1.11 *************** *** 22,27 **** import org.oscarehr.PMmodule.model.IntakeNode; - import ca.uhn.hl7v2.util.MessageIterator.Index; - public class AnswerScalarTextHtmlAdapter extends AbstractAnswerScalarHtmlAdapter { --- 22,25 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:19
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/docs Modified Files: gerrit_working_model.txt Log Message: changed all commons logging to log4j logging Index: gerrit_working_model.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/gerrit_working_model.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** gerrit_working_model.txt 11 Nov 2010 01:49:37 -0000 1.13 --- gerrit_working_model.txt 15 Nov 2010 01:27:35 -0000 1.14 *************** *** 117,119 **** - in mysql : insert into projects (use_contributor_agreements,submit_type,name) values ('N','M','test2'); - gerrit.sh start - --- 117,118 ---- |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements Modified Files: MeasurementInfo.java MeasurementTemplateFlowSheetConfig.java MeasurementFlowSheet.java Log Message: changed all commons logging to log4j logging Index: MeasurementFlowSheet.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/MeasurementFlowSheet.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** MeasurementFlowSheet.java 11 Nov 2010 01:35:12 -0000 1.16 --- MeasurementFlowSheet.java 15 Nov 2010 01:27:38 -0000 1.17 *************** *** 42,47 **** import org.apache.commons.collections.OrderedMapIterator; import org.apache.commons.collections.map.ListOrderedMap; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.drools.RuleBase; import org.drools.WorkingMemory; --- 42,46 ---- import org.apache.commons.collections.OrderedMapIterator; import org.apache.commons.collections.map.ListOrderedMap; ! import org.apache.log4j.Logger; import org.drools.RuleBase; import org.drools.WorkingMemory; *************** *** 62,66 **** public class MeasurementFlowSheet { ! private static Log log = LogFactory.getLog(MeasurementFlowSheet.class); String name = null; private String displayName = null; --- 61,65 ---- public class MeasurementFlowSheet { ! private static Logger log = MiscUtils.getLogger(); String name = null; private String displayName = null; Index: MeasurementInfo.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/MeasurementInfo.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MeasurementInfo.java 9 Jul 2010 21:56:38 -0000 1.8 --- MeasurementInfo.java 15 Nov 2010 01:27:38 -0000 1.9 *************** *** 37,42 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 37,41 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 49,53 **** */ public class MeasurementInfo { ! private static Log log = LogFactory.getLog(MeasurementInfo.class); ArrayList warning = null; --- 48,52 ---- */ public class MeasurementInfo { ! private static Logger log = MiscUtils.getLogger(); ArrayList warning = null; Index: MeasurementTemplateFlowSheetConfig.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/MeasurementTemplateFlowSheetConfig.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** MeasurementTemplateFlowSheetConfig.java 12 Jul 2010 22:30:11 -0000 1.16 --- MeasurementTemplateFlowSheetConfig.java 15 Nov 2010 01:27:38 -0000 1.17 *************** *** 42,47 **** import java.util.Vector; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.drools.RuleBase; import org.jdom.Attribute; --- 42,46 ---- import java.util.Vector; ! import org.apache.log4j.Logger; import org.drools.RuleBase; import org.jdom.Attribute; *************** *** 68,72 **** public class MeasurementTemplateFlowSheetConfig implements InitializingBean { ! private static Log log = LogFactory.getLog(MeasurementTemplateFlowSheetConfig.class); private List<File> flowSheets; --- 67,71 ---- public class MeasurementTemplateFlowSheetConfig implements InitializingBean { ! private static Logger log = MiscUtils.getLogger(); private List<File> flowSheets; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/decisionSupport/model/impl/drools In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/decisionSupport/model/impl/drools Modified Files: DSGuidelineDrools.java Log Message: changed all commons logging to log4j logging Index: DSGuidelineDrools.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/decisionSupport/model/impl/drools/DSGuidelineDrools.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DSGuidelineDrools.java 18 Oct 2010 19:04:36 -0000 1.9 --- DSGuidelineDrools.java 15 Nov 2010 01:27:34 -0000 1.10 *************** *** 6,15 **** package org.oscarehr.decisionSupport.model.impl.drools; ! import java.lang.reflect.*; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.StringUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.drools.FactException; import org.drools.RuleBase; --- 6,16 ---- package org.oscarehr.decisionSupport.model.impl.drools; ! import java.lang.reflect.Constructor; ! import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; + import org.apache.commons.lang.StringUtils; ! import org.apache.log4j.Logger; import org.drools.FactException; import org.drools.RuleBase; *************** *** 17,28 **** import org.jdom.Element; import org.jdom.Namespace; - import org.jdom.output.Format; - import org.jdom.output.XMLOutputter; - import org.oscarehr.decisionSupport.model.DSParameter; import org.oscarehr.decisionSupport.model.DSCondition; import org.oscarehr.decisionSupport.model.DSConsequence; import org.oscarehr.decisionSupport.model.DSDemographicAccess; import org.oscarehr.decisionSupport.model.DSGuideline; import org.oscarehr.decisionSupport.model.DecisionSupportException; import oscar.oscarEncounter.oscarMeasurements.util.RuleBaseCreator; --- 18,29 ---- import org.jdom.Element; import org.jdom.Namespace; import org.oscarehr.decisionSupport.model.DSCondition; import org.oscarehr.decisionSupport.model.DSConsequence; import org.oscarehr.decisionSupport.model.DSDemographicAccess; import org.oscarehr.decisionSupport.model.DSGuideline; + import org.oscarehr.decisionSupport.model.DSParameter; import org.oscarehr.decisionSupport.model.DecisionSupportException; + import org.oscarehr.util.MiscUtils; + import oscar.oscarEncounter.oscarMeasurements.util.RuleBaseCreator; *************** *** 33,37 **** */ public class DSGuidelineDrools extends DSGuideline { ! private static final Log log = LogFactory.getLog(RuleBaseCreator.class); Namespace namespace = Namespace.getNamespace("http://drools.org/rules"); --- 34,38 ---- */ public class DSGuidelineDrools extends DSGuideline { ! private static final Logger log=MiscUtils.getLogger(); Namespace namespace = Namespace.getNamespace("http://drools.org/rules"); |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/task In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/PMmodule/task Modified Files: ErProgramDischargeTask.java BedProgramDischargeTask.java AnonymousClientDischargeTask.java Log Message: changed all commons logging to log4j logging Index: BedProgramDischargeTask.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/task/BedProgramDischargeTask.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** BedProgramDischargeTask.java 23 Nov 2009 19:03:59 -0000 1.14 --- BedProgramDischargeTask.java 15 Nov 2010 01:27:37 -0000 1.15 *************** *** 26,31 **** import java.util.TimerTask; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.exception.AdmissionException; import org.oscarehr.PMmodule.model.Bed; --- 26,30 ---- import java.util.TimerTask; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.exception.AdmissionException; import org.oscarehr.PMmodule.model.Bed; *************** *** 45,49 **** public class BedProgramDischargeTask extends TimerTask { ! private static final Log log = LogFactory.getLog(BedProgramDischargeTask.class); // TODO IC Bedlog bedProgram.getDischargeTime(); --- 44,48 ---- public class BedProgramDischargeTask extends TimerTask { ! private static final Logger log=MiscUtils.getLogger(); // TODO IC Bedlog bedProgram.getDischargeTime(); Index: AnonymousClientDischargeTask.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/task/AnonymousClientDischargeTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AnonymousClientDischargeTask.java 23 Mar 2010 17:34:19 -0000 1.1 --- AnonymousClientDischargeTask.java 15 Nov 2010 01:27:37 -0000 1.2 *************** *** 5,18 **** import java.util.TimerTask; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.Admission; import org.oscarehr.PMmodule.service.AdmissionManager; import org.oscarehr.util.LoggedInInfo; import org.oscarehr.util.SpringUtils; public class AnonymousClientDischargeTask extends TimerTask { ! private static final Log logger = LogFactory.getLog(AnonymousClientDischargeTask.class); public void run() { --- 5,18 ---- import java.util.TimerTask; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.Admission; import org.oscarehr.PMmodule.service.AdmissionManager; import org.oscarehr.util.LoggedInInfo; + import org.oscarehr.util.MiscUtils; import org.oscarehr.util.SpringUtils; public class AnonymousClientDischargeTask extends TimerTask { ! private static final Logger logger = MiscUtils.getLogger(); public void run() { Index: ErProgramDischargeTask.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/task/ErProgramDischargeTask.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ErProgramDischargeTask.java 23 Nov 2009 19:03:58 -0000 1.11 --- ErProgramDischargeTask.java 15 Nov 2010 01:27:37 -0000 1.12 *************** *** 28,33 **** import java.util.TimerTask; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.model.Admission; import org.oscarehr.PMmodule.model.ProgramProvider; --- 28,32 ---- import java.util.TimerTask; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.model.Admission; import org.oscarehr.PMmodule.model.ProgramProvider; *************** *** 44,48 **** public class ErProgramDischargeTask extends TimerTask { ! private static final Log log = LogFactory.getLog(ErProgramDischargeTask.class); private ProviderManager providerManager; --- 43,47 ---- public class ErProgramDischargeTask extends TimerTask { ! private static final Logger log=MiscUtils.getLogger(); private ProviderManager providerManager; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/eform/data Modified Files: EForm.java Log Message: changed all commons logging to log4j logging Index: EForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data/EForm.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** EForm.java 11 Nov 2010 01:35:11 -0000 1.26 --- EForm.java 15 Nov 2010 01:27:37 -0000 1.27 *************** *** 34,43 **** import java.util.regex.Pattern; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionMessages; import org.oscarehr.common.OtherIdManager; import org.oscarehr.common.dao.EFormDataDao; import org.oscarehr.common.model.EFormData; import org.oscarehr.util.SpringUtils; --- 34,43 ---- import java.util.regex.Pattern; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionMessages; import org.oscarehr.common.OtherIdManager; import org.oscarehr.common.dao.EFormDataDao; import org.oscarehr.common.model.EFormData; + import org.oscarehr.util.MiscUtils; import org.oscarehr.util.SpringUtils; *************** *** 55,59 **** private static String appt_provider = ""; private static HashMap sql_params = new HashMap(); ! private static Log log = LogFactory.getLog(EForm.class); private String parentAjaxId = null; private HashMap<String, String> fieldValues = new HashMap<String, String>(); --- 55,59 ---- private static String appt_provider = ""; private static HashMap sql_params = new HashMap(); ! private static Logger log = MiscUtils.getLogger(); private String parentAjaxId = null; private HashMap<String, String> fieldValues = new HashMap<String, String>(); |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/phr/service In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/phr/service Modified Files: PHRService.java Log Message: changed all commons logging to log4j logging Index: PHRService.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/phr/service/PHRService.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** PHRService.java 12 Aug 2010 03:31:50 -0000 1.14 --- PHRService.java 15 Nov 2010 01:27:38 -0000 1.15 *************** *** 32,36 **** import java.util.List; - import org.oscarehr.common.model.Provider; import org.oscarehr.phr.PHRAuthentication; import org.oscarehr.phr.dao.PHRActionDAO; --- 32,35 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/decisionSupport In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/decisionSupport Modified Files: BillingGuidelines.java Log Message: changed all commons logging to log4j logging Index: BillingGuidelines.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/decisionSupport/BillingGuidelines.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BillingGuidelines.java 11 Nov 2010 01:35:15 -0000 1.5 --- BillingGuidelines.java 15 Nov 2010 01:27:38 -0000 1.6 *************** *** 33,41 **** import java.io.InputStreamReader; import java.util.ArrayList; - import java.util.List; import java.util.HashMap; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.decisionSupport.model.DSConsequence; import org.oscarehr.decisionSupport.model.DSGuideline; --- 33,40 ---- import java.io.InputStreamReader; import java.util.ArrayList; import java.util.HashMap; + import java.util.List; ! import org.apache.log4j.Logger; import org.oscarehr.decisionSupport.model.DSConsequence; import org.oscarehr.decisionSupport.model.DSGuideline; *************** *** 53,57 **** public class BillingGuidelines { ! private static Log log = LogFactory.getLog(BillingGuidelines.class); private List<DSGuideline> billingGuideLines = null ; --- 52,56 ---- public class BillingGuidelines { ! private static Logger log = MiscUtils.getLogger(); private List<DSGuideline> billingGuideLines = null ; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/CML In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/CML Modified Files: CMLLabTest.java Log Message: changed all commons logging to log4j logging Index: CMLLabTest.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/CML/CMLLabTest.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** CMLLabTest.java 11 Nov 2010 01:35:13 -0000 1.19 --- CMLLabTest.java 15 Nov 2010 01:27:38 -0000 1.20 *************** *** 35,40 **** import org.apache.commons.lang.StringUtils; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 35,39 ---- import org.apache.commons.lang.StringUtils; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 48,52 **** */ public class CMLLabTest { ! private static Log log = LogFactory.getLog(CMLLabTest.class); public String locationId = null; // 2. (e.g. 70 = CML Mississauga) --- 47,51 ---- */ public class CMLLabTest { ! private static Logger log = MiscUtils.getLogger(); public String locationId = null; // 2. (e.g. 70 = CML Mississauga) |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util Modified Files: TargetColour.java TargetCondition.java RuleBaseCreator.java MeasurementDSHelper.java RecommendationCondition.java Recommendation.java Log Message: changed all commons logging to log4j logging Index: Recommendation.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util/Recommendation.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Recommendation.java 9 Jul 2010 21:56:37 -0000 1.3 --- Recommendation.java 15 Nov 2010 01:27:33 -0000 1.4 *************** *** 29,35 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.jdom.Element; --- 29,35 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.jdom.Element; + import org.oscarehr.util.MiscUtils; *************** *** 39,43 **** */ public class Recommendation { ! private static final Log log = LogFactory.getLog(Recommendation.class); private String strength = null; --- 39,43 ---- */ public class Recommendation { ! private static final Logger log=MiscUtils.getLogger(); private String strength = null; Index: RecommendationCondition.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util/RecommendationCondition.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RecommendationCondition.java 9 Jul 2010 21:56:37 -0000 1.3 --- RecommendationCondition.java 15 Nov 2010 01:27:33 -0000 1.4 *************** *** 28,34 **** import java.util.ArrayList; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.jdom.Element; /** --- 28,34 ---- import java.util.ArrayList; ! import org.apache.log4j.Logger; import org.jdom.Element; + import org.oscarehr.util.MiscUtils; /** *************** *** 49,53 **** */ public class RecommendationCondition { ! private static final Log log = LogFactory.getLog(RecommendationCondition.class); private String type = null; --- 49,53 ---- */ public class RecommendationCondition { ! private static final Logger log=MiscUtils.getLogger(); private String type = null; Index: RuleBaseCreator.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util/RuleBaseCreator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RuleBaseCreator.java 12 Jul 2010 20:04:11 -0000 1.3 --- RuleBaseCreator.java 15 Nov 2010 01:27:33 -0000 1.4 *************** *** 30,35 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.drools.RuleBase; import org.drools.io.RuleBaseLoader; --- 30,34 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.drools.RuleBase; import org.drools.io.RuleBaseLoader; *************** *** 38,41 **** --- 37,41 ---- import org.jdom.output.Format; import org.jdom.output.XMLOutputter; + import org.oscarehr.util.MiscUtils; /** *************** *** 44,48 **** */ public class RuleBaseCreator { ! private static final Log log = LogFactory.getLog(RuleBaseCreator.class); Namespace namespace = Namespace.getNamespace("http://drools.org/rules"); --- 44,48 ---- */ public class RuleBaseCreator { ! private static final Logger log=MiscUtils.getLogger(); Namespace namespace = Namespace.getNamespace("http://drools.org/rules"); Index: TargetCondition.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util/TargetCondition.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TargetCondition.java 9 Jul 2010 21:56:37 -0000 1.3 --- TargetCondition.java 15 Nov 2010 01:27:33 -0000 1.4 *************** *** 28,34 **** import java.util.ArrayList; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.jdom.Element; /** --- 28,34 ---- import java.util.ArrayList; ! import org.apache.log4j.Logger; import org.jdom.Element; + import org.oscarehr.util.MiscUtils; /** *************** *** 49,53 **** */ public class TargetCondition { ! private static final Log log = LogFactory.getLog(TargetCondition.class); private String type = null; --- 49,53 ---- */ public class TargetCondition { ! private static final Logger log=MiscUtils.getLogger(); private String type = null; Index: TargetColour.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util/TargetColour.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TargetColour.java 9 Jul 2010 21:56:37 -0000 1.4 --- TargetColour.java 15 Nov 2010 01:27:33 -0000 1.5 *************** *** 29,35 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.jdom.Element; /** --- 29,35 ---- import java.util.List; ! import org.apache.log4j.Logger; import org.jdom.Element; + import org.oscarehr.util.MiscUtils; /** *************** *** 48,52 **** */ public class TargetColour { ! private static final Log log = LogFactory.getLog(TargetColour.class); private String additionConsequence = null; --- 48,52 ---- */ public class TargetColour { ! private static final Logger log=MiscUtils.getLogger(); private String additionConsequence = null; Index: MeasurementDSHelper.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util/MeasurementDSHelper.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MeasurementDSHelper.java 9 Jul 2010 21:56:37 -0000 1.6 --- MeasurementDSHelper.java 15 Nov 2010 01:27:33 -0000 1.7 *************** *** 33,38 **** import java.util.Date; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 33,37 ---- import java.util.Date; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 46,50 **** */ public class MeasurementDSHelper { ! private static Log log = LogFactory.getLog(MeasurementDSHelper.class); EctMeasurementsDataBean mdb = null; --- 45,49 ---- */ public class MeasurementDSHelper { ! private static Logger log = MiscUtils.getLogger(); EctMeasurementsDataBean mdb = null; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/billing/dao Modified Files: ProcedimentoRealizadoDAO.java Log Message: changed all commons logging to log4j logging Index: ProcedimentoRealizadoDAO.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/dao/ProcedimentoRealizadoDAO.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ProcedimentoRealizadoDAO.java 6 Oct 2010 21:52:11 -0000 1.11 --- ProcedimentoRealizadoDAO.java 15 Nov 2010 01:27:38 -0000 1.12 *************** *** 28,32 **** import java.util.ArrayList; import java.util.List; - import java.util.Properties; import org.oscarehr.util.MiscUtils; --- 28,31 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/survey/web In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/oscarehr/survey/web Modified Files: SurveyTestAction.java SurveyManagerAction.java Log Message: changed all commons logging to log4j logging Index: SurveyManagerAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/survey/web/SurveyManagerAction.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** SurveyManagerAction.java 9 Jul 2010 21:56:43 -0000 1.24 --- SurveyManagerAction.java 15 Nov 2010 01:27:38 -0000 1.25 *************** *** 38,43 **** 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; --- 38,42 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 68,72 **** public class SurveyManagerAction extends AbstractSurveyAction { ! private Log log = LogFactory.getLog(getClass()); private SurveyManager surveyManager; --- 67,71 ---- public class SurveyManagerAction extends AbstractSurveyAction { ! private static Logger log = MiscUtils.getLogger(); private SurveyManager surveyManager; Index: SurveyTestAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/survey/web/SurveyTestAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SurveyTestAction.java 26 Mar 2007 02:43:52 -0000 1.3 --- SurveyTestAction.java 15 Nov 2010 01:27:38 -0000 1.4 *************** *** 35,40 **** 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; --- 35,39 ---- import javax.servlet.http.HttpServletResponse; ! import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; *************** *** 51,59 **** import org.oscarehr.surveymodel.SurveyDocument; import org.oscarehr.surveymodel.SurveyDocument.Survey; public class SurveyTestAction extends AbstractSurveyAction { ! private Log log = LogFactory.getLog(getClass()); private SurveyManager surveyManager; --- 50,59 ---- import org.oscarehr.surveymodel.SurveyDocument; import org.oscarehr.surveymodel.SurveyDocument.Survey; + import org.oscarehr.util.MiscUtils; public class SurveyTestAction extends AbstractSurveyAction { ! private static Logger log = MiscUtils.getLogger(); private SurveyManager surveyManager; |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/caisi/tickler/prepared In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/org/caisi/tickler/prepared Modified Files: PreparedTicklerManager.java Log Message: changed all commons logging to log4j logging Index: PreparedTicklerManager.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/caisi/tickler/prepared/PreparedTicklerManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PreparedTicklerManager.java 6 Jan 2007 01:44:49 -0000 1.4 --- PreparedTicklerManager.java 15 Nov 2010 01:27:38 -0000 1.5 *************** *** 28,37 **** import java.util.List; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; public class PreparedTicklerManager { ! static Log log = LogFactory.getLog(PreparedTicklerManager.class); private List ticklers; --- 28,37 ---- import java.util.List; ! import org.apache.log4j.Logger; ! import org.oscarehr.util.MiscUtils; public class PreparedTicklerManager { ! static Logger log=MiscUtils.getLogger(); private List ticklers; |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/web/admin In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/com/quatro/web/admin Modified Files: UserSearchAction.java UserManagerAction.java ShowORGTreeAction.java RoleManagerAction.java Log Message: changed all commons logging to log4j logging Index: UserManagerAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/web/admin/UserManagerAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UserManagerAction.java 11 Nov 2010 01:35:14 -0000 1.5 --- UserManagerAction.java 15 Nov 2010 01:27:38 -0000 1.6 *************** *** 32,36 **** import org.oscarehr.PMmodule.web.admin.BaseAdminAction; import org.oscarehr.util.MiscUtils; - import org.apache.struts.actions.DispatchAction; import com.quatro.common.KeyConstants; --- 32,35 ---- *************** *** 40,50 **** import com.quatro.model.security.Secuserrole; import com.quatro.service.LookupManager; - import com.quatro.service.ORGManager; - import com.quatro.service.security.RolesManager; - import com.quatro.service.security.SecurityManager; import com.quatro.service.security.UsersManager; ! import com.quatro.model.LookupCodeValue; ! import com.quatro.service.LookupManager; ! import com.quatro.util.*; public class UserManagerAction extends BaseAdminAction { --- 39,44 ---- import com.quatro.model.security.Secuserrole; import com.quatro.service.LookupManager; import com.quatro.service.security.UsersManager; ! import com.quatro.util.Utility; public class UserManagerAction extends BaseAdminAction { Index: UserSearchAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/web/admin/UserSearchAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** UserSearchAction.java 2 Jul 2010 18:51:12 -0000 1.4 --- UserSearchAction.java 15 Nov 2010 01:27:38 -0000 1.5 *************** *** 12,16 **** import java.util.ArrayList; - import java.util.Hashtable; import java.util.List; --- 12,15 ---- Index: RoleManagerAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/web/admin/RoleManagerAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RoleManagerAction.java 2 Jul 2010 18:48:27 -0000 1.4 --- RoleManagerAction.java 15 Nov 2010 01:27:38 -0000 1.5 *************** *** 27,41 **** import org.oscarehr.PMmodule.service.LogManager; import org.oscarehr.PMmodule.web.admin.BaseAdminAction; - import org.apache.struts.actions.DispatchAction; import com.quatro.common.KeyConstants; - import com.quatro.model.DataViews; import com.quatro.model.LookupCodeValue; - import com.quatro.model.ReportFilterValue; - import com.quatro.model.ReportTempCriValue; - import com.quatro.model.ReportValue; import com.quatro.model.security.NoAccessException; import com.quatro.model.security.Secobjprivilege; - import com.quatro.model.security.Secrole; import com.quatro.service.LookupManager; --- 27,35 ---- Index: ShowORGTreeAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/web/admin/ShowORGTreeAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ShowORGTreeAction.java 23 Jun 2009 18:35:40 -0000 1.3 --- ShowORGTreeAction.java 15 Nov 2010 01:27:38 -0000 1.4 *************** *** 23,27 **** import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm; - import org.apache.struts.actions.DispatchAction; import org.oscarehr.PMmodule.web.admin.BaseAdminAction; --- 23,26 ---- |
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean Modified Files: EctMeasurementTypeBeanHandler.java EctMeasurementsDataBeanHandler.java Log Message: changed all commons logging to log4j logging Index: EctMeasurementTypeBeanHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean/EctMeasurementTypeBeanHandler.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** EctMeasurementTypeBeanHandler.java 6 Oct 2010 21:52:11 -0000 1.12 --- EctMeasurementTypeBeanHandler.java 15 Nov 2010 01:27:38 -0000 1.13 *************** *** 32,37 **** import java.sql.SQLException; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 32,36 ---- import java.sql.SQLException; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 44,48 **** */ public class EctMeasurementTypeBeanHandler { ! private static Log log = LogFactory.getLog(EctMeasurementTypeBeanHandler.class); /** Creates a new instance of EctMeasurementTypeBeanHandler */ --- 43,47 ---- */ public class EctMeasurementTypeBeanHandler { ! private static Logger log = MiscUtils.getLogger(); /** Creates a new instance of EctMeasurementTypeBeanHandler */ Index: EctMeasurementsDataBeanHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean/EctMeasurementsDataBeanHandler.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** EctMeasurementsDataBeanHandler.java 6 Oct 2010 21:52:11 -0000 1.28 --- EctMeasurementsDataBeanHandler.java 15 Nov 2010 01:27:38 -0000 1.29 *************** *** 33,38 **** import java.util.Vector; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.util.MiscUtils; --- 33,37 ---- import java.util.Vector; ! import org.apache.log4j.Logger; import org.oscarehr.util.MiscUtils; *************** *** 41,45 **** public class EctMeasurementsDataBeanHandler { ! private static Log log = LogFactory.getLog(EctMeasurementsDataBeanHandler.class); Vector measurementsDataVector = new Vector(); --- 40,44 ---- public class EctMeasurementsDataBeanHandler { ! private static Logger log = MiscUtils.getLogger(); Vector measurementsDataVector = new Vector(); |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:15
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/com/quatro/dao Modified Files: LookupDao.java ORGDao.java Log Message: changed all commons logging to log4j logging Index: ORGDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/ORGDao.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ORGDao.java 23 Jun 2009 18:35:38 -0000 1.3 --- ORGDao.java 15 Nov 2010 01:27:37 -0000 1.4 *************** *** 16,20 **** import com.quatro.model.LookupTableDefValue; - import com.quatro.dao.LookupDao; public class ORGDao extends HibernateDaoSupport { --- 16,19 ---- Index: LookupDao.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/LookupDao.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** LookupDao.java 6 Oct 2010 21:52:09 -0000 1.20 --- LookupDao.java 15 Nov 2010 01:27:37 -0000 1.21 *************** *** 4,15 **** import java.sql.SQLException; import java.util.ArrayList; - import java.util.GregorianCalendar; - import java.util.List; import java.util.Calendar; ! import org.caisi.dao.ProviderDAO; ! import org.hibernate.Criteria; ! import org.hibernate.criterion.Order; ! import org.hibernate.criterion.Restrictions; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; --- 4,14 ---- import java.sql.SQLException; import java.util.ArrayList; import java.util.Calendar; + import java.util.List; ! import org.oscarehr.PMmodule.dao.ProviderDao; ! import org.oscarehr.PMmodule.model.Program; ! import org.oscarehr.common.model.Facility; ! import org.oscarehr.util.MiscUtils; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; *************** *** 20,24 **** import com.quatro.common.KeyConstants; - import com.quatro.model.Attachment; import com.quatro.model.FieldDefValue; import com.quatro.model.LookupCodeValue; --- 19,22 ---- *************** *** 28,38 **** import com.quatro.util.Utility; - import org.oscarehr.PMmodule.dao.ProviderDao; - import org.oscarehr.PMmodule.model.Program; - import org.oscarehr.common.model.Facility; - import org.oscarehr.util.MiscUtils; - - import java.util.Calendar; - public class LookupDao extends HibernateDaoSupport { --- 26,29 ---- |
|
From: Ted L. <ted...@us...> - 2010-11-15 01:28:15
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/task In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29120/web/WEB-INF/classes/src/oscar/ocan/task Modified Files: OcanSubmissionTask.java Log Message: changed all commons logging to log4j logging Index: OcanSubmissionTask.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/ocan/task/OcanSubmissionTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OcanSubmissionTask.java 23 Nov 2009 19:04:09 -0000 1.3 --- OcanSubmissionTask.java 15 Nov 2010 01:27:37 -0000 1.4 *************** *** 35,40 **** import javax.xml.bind.JAXBException; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.oscarehr.PMmodule.service.GenericIntakeManager; import org.oscarehr.util.DbConnectionFilter; --- 35,39 ---- import javax.xml.bind.JAXBException; ! import org.apache.log4j.Logger; import org.oscarehr.PMmodule.service.GenericIntakeManager; import org.oscarehr.util.DbConnectionFilter; *************** *** 48,52 **** public class OcanSubmissionTask extends TimerTask { ! private static final Log log = LogFactory.getLog(OcanSubmissionTask.class); private GenericIntakeManager genericIntakeManager; --- 47,51 ---- public class OcanSubmissionTask extends TimerTask { ! private static final Logger logger = MiscUtils.getLogger(); private GenericIntakeManager genericIntakeManager; *************** *** 68,72 **** LoggedInInfo.setLoggedInInfoToCurrentClassAndMethod(); try { ! log.info("start ocan submission task"); OcanProcess process = ocanDataProcessor.createOcanProcess(); --- 67,71 ---- LoggedInInfo.setLoggedInInfoToCurrentClassAndMethod(); try { ! logger.info("start ocan submission task"); OcanProcess process = ocanDataProcessor.createOcanProcess(); *************** *** 86,90 **** if (intakes == null || intakes.size() == 0) { ! log.warn("getIntakeListforOcan() returned null or empty list - no data for submission."); return; } --- 85,89 ---- if (intakes == null || intakes.size() == 0) { ! logger.warn("getIntakeListforOcan() returned null or empty list - no data for submission."); return; } *************** *** 93,99 **** MiscUtils.checkShutdownSignaled(); - // log.info("client:\n" + intakeMap.get("client")); - // log.info("staff:\n" + intakeMap.get("staff")); - try { ocanDataProcessor.createOcanRecord(process, --- 92,95 ---- *************** *** 103,107 **** } catch (Exception e) { ! log.error("createOcanRecord() thrown an exception, skipping the record.", e); continue; } --- 99,103 ---- } catch (Exception e) { ! logger.error("createOcanRecord() thrown an exception, skipping the record.", e); continue; } *************** *** 111,126 **** ocanDataProcessor.finishOcanProcess(process); ! log.info("finish ocan submission task"); } catch (ShutdownException e) { ! log.debug("OcanSubmissionTask noticed shutdown signaled."); } catch (FileNotFoundException e) { ! log.error("finishOcanProcess() thrown an exception, terminating the submission.", e); } catch (JAXBException e) { ! log.error("finishOcanProcess() thrown an exception, terminating the submission.", e); } catch (NumberFormatException e) { ! log.error("finishOcanProcess() thrown an exception, terminating the submission.", e); } catch (ParseException e) { ! log.error("finishOcanProcess() thrown an exception, terminating the submission.", e); } finally { LoggedInInfo.loggedInInfo.remove(); --- 107,122 ---- ocanDataProcessor.finishOcanProcess(process); ! logger.info("finish ocan submission task"); } catch (ShutdownException e) { ! logger.debug("OcanSubmissionTask noticed shutdown signaled."); } catch (FileNotFoundException e) { ! logger.error("finishOcanProcess() thrown an exception, terminating the submission.", e); } catch (JAXBException e) { ! logger.error("finishOcanProcess() thrown an exception, terminating the submission.", e); } catch (NumberFormatException e) { ! logger.error("finishOcanProcess() thrown an exception, terminating the submission.", e); } catch (ParseException e) { ! logger.error("finishOcanProcess() thrown an exception, terminating the submission.", e); } finally { LoggedInInfo.loggedInInfo.remove(); |
