oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/caisi_integrator IntegratorRoleUtils.java, NONE, 1.2.6.2

[Ronnie C. <cr...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/caisi_integrator
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv20697

Added Files:
      Tag: RELEASE_9_12
	IntegratorRoleUtils.java 
Log Message:
ID: 3101818
Added class IntegratorRoleUtils to prepare Role for integrator input

--- NEW FILE: IntegratorRoleUtils.java ---
package org.oscarehr.PMmodule.caisi_integrator;

import org.oscarehr.caisi_integrator.ws.Role;

public final class IntegratorRoleUtils {
	
	/**
	 * @return the matching integrator role, the input can be null and it will just return null, roles that do not match will also return null.
	 */
	public static Role getIntegratorRole(String oscarRole)
	{
		if (oscarRole==null) return(null);
		
		try
		{
			return(Role.valueOf(oscarRole.toUpperCase().replaceAll(" ", "_")));
		}
		catch (Exception e)
		{
			// just ignore it, we're just testing for direct matches, null and non matches are expected
		}

		// we can put special cases where mapping is not simple, like as an example :  
		// if ("Front Desk Worker".equals(oscarRole)) return(Role.FDW);
		
		return(null);
	}
}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/caisi_integrator CaisiIntegratorUpdateTask.java, 1.110.2.8, 1.110.2.9

[Ronnie C. <cr...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/caisi_integrator
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv20639

Modified Files:
      Tag: RELEASE_9_12
	CaisiIntegratorUpdateTask.java 
Log Message:
ID: 3101818
Added class IntegratorRoleUtils to prepare Role for integrator input

Index: CaisiIntegratorUpdateTask.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/caisi_integrator/CaisiIntegratorUpdateTask.java,v
retrieving revision 1.110.2.8
retrieving revision 1.110.2.9
diff -C2 -d -r1.110.2.8 -r1.110.2.9
*** CaisiIntegratorUpdateTask.java	2 Nov 2010 21:36:14 -0000	1.110.2.8
--- CaisiIntegratorUpdateTask.java	10 Nov 2010 16:17:41 -0000	1.110.2.9
***************
*** 365,369 ****
  			for (SecUserRole role : roles)
  			{
! 				providerTransfer.getRoles().add(Role.fromValue(role.getRoleName()));
  			}
  			
--- 365,370 ----
  			for (SecUserRole role : roles)
  			{
!                                 Role integratorRole=IntegratorRoleUtils.getIntegratorRole(role.getRoleName());
!                                 if (integratorRole!=null) providerTransfer.getRoles().add(integratorRole);
  			}
  			

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql/updates update-2010-11-04.sql, 1.1, 1.2 update-2010-11-05.sql, 1.1, 1.2

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3138/database/mysql/updates

Modified Files:
	update-2010-11-04.sql update-2010-11-05.sql 
Log Message:
removed defaults


Index: update-2010-11-04.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates/update-2010-11-04.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** update-2010-11-04.sql	4 Nov 2010 06:25:15 -0000	1.1
--- update-2010-11-04.sql	10 Nov 2010 15:14:43 -0000	1.2
***************
*** 10,14 ****
  );
  
! alter table document add appointment_no integer default NULL;
  
  insert into issue (code,description,role,update_date,priority,type) values ('PastOcularHistory','Past Ocular History','nurse',now(),NULL,'system');
--- 10,14 ----
  );
  
! alter table document add appointment_no integer;
  
  insert into issue (code,description,role,update_date,priority,type) values ('PastOcularHistory','Past Ocular History','nurse',now(),NULL,'system');

Index: update-2010-11-05.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/updates/update-2010-11-05.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** update-2010-11-05.sql	8 Nov 2010 02:49:58 -0000	1.1
--- update-2010-11-05.sql	10 Nov 2010 15:14:43 -0000	1.2
***************
*** 8,19 ****
  CREATE TABLE `eyeform_followup` (
    `id` int(11) NOT NULL AUTO_INCREMENT,
!   `appointment_no` int(11) DEFAULT NULL,
!   `demographic_no` int(11) DEFAULT NULL,
!   `timespan` int(11) DEFAULT NULL,
!   `timeframe` varchar(25) DEFAULT NULL,
!   `followup_provider` varchar(100) DEFAULT NULL,
!   `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
    PRIMARY KEY (`id`)
! ) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
--- 8,19 ----
  CREATE TABLE `eyeform_followup` (
    `id` int(11) NOT NULL AUTO_INCREMENT,
!   `appointment_no` int(11)  ,
!   `demographic_no` int(11) ,
!   `timespan` int(11) ,
!   `timeframe` varchar(25) ,
!   `followup_provider` varchar(100) ,
!   `date` timestamp ,
    PRIMARY KEY (`id`)
! ) ENGINE=MyISAM AUTO_INCREMENT=6 ;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
***************
*** 30,55 ****
    `display_order` tinyint(4) NOT NULL,
    `impression` text COLLATE utf8_bin,
!   `followup_no` smallint(5) DEFAULT NULL,
!   `followup_unit` varchar(50) COLLATE utf8_bin DEFAULT NULL,
!   `followup_doctor` varchar(6) COLLATE utf8_bin DEFAULT NULL,
!   `followup_reason` varchar(255) COLLATE utf8_bin DEFAULT NULL,
!   `tickler_staff` varchar(6) COLLATE utf8_bin DEFAULT NULL,
!   `billing_visit_type` varchar(50) COLLATE utf8_bin DEFAULT NULL,
!   `billing_visit_location` varchar(50) COLLATE utf8_bin DEFAULT NULL,
    `billing_codes` text COLLATE utf8_bin,
!   `billing_dxcode` varchar(50) COLLATE utf8_bin DEFAULT NULL,
!   `billing_total` varchar(50) COLLATE utf8_bin DEFAULT NULL,
!   `billing_comment` varchar(255) COLLATE utf8_bin DEFAULT NULL,
!   `billing_billtype` varchar(50) COLLATE utf8_bin DEFAULT NULL,
!   `billing_pay_method` varchar(50) COLLATE utf8_bin DEFAULT NULL,
!   `billing_billto` varchar(50) COLLATE utf8_bin DEFAULT NULL,
!   `billing_remitto` varchar(50) COLLATE utf8_bin DEFAULT NULL,
!   `billing_gstBilledTotal` varchar(50) COLLATE utf8_bin DEFAULT NULL,
!   `billing_payment` varchar(50) COLLATE utf8_bin DEFAULT NULL,
!   `billing_refund` varchar(50) COLLATE utf8_bin DEFAULT NULL,
!   `billing_gst` varchar(50) COLLATE utf8_bin DEFAULT NULL,
    `test_records` text COLLATE utf8_bin,
    PRIMARY KEY (`id`)
! ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
--- 30,55 ----
    `display_order` tinyint(4) NOT NULL,
    `impression` text COLLATE utf8_bin,
!   `followup_no` smallint(5),
!   `followup_unit` varchar(50) COLLATE utf8_bin ,
!   `followup_doctor` varchar(6) COLLATE utf8_bin ,
!   `followup_reason` varchar(255) COLLATE utf8_bin ,
!   `tickler_staff` varchar(6) COLLATE utf8_bin ,
!   `billing_visit_type` varchar(50) COLLATE utf8_bin,
!   `billing_visit_location` varchar(50) COLLATE utf8_bin ,
    `billing_codes` text COLLATE utf8_bin,
!   `billing_dxcode` varchar(50) COLLATE utf8_bin ,
!   `billing_total` varchar(50) COLLATE utf8_bin ,
!   `billing_comment` varchar(255) COLLATE utf8_bin ,
!   `billing_billtype` varchar(50) COLLATE utf8_bin ,
!   `billing_pay_method` varchar(50) COLLATE utf8_bin ,
!   `billing_billto` varchar(50) COLLATE utf8_bin ,
!   `billing_remitto` varchar(50) COLLATE utf8_bin ,
!   `billing_gstBilledTotal` varchar(50) COLLATE utf8_bin ,
!   `billing_payment` varchar(50) COLLATE utf8_bin ,
!   `billing_refund` varchar(50) COLLATE utf8_bin ,
!   `billing_gst` varchar(50) COLLATE utf8_bin ,
    `test_records` text COLLATE utf8_bin,
    PRIMARY KEY (`id`)
! ) ENGINE=MyISAM AUTO_INCREMENT=2;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
***************
*** 63,80 ****
  CREATE TABLE `ocularprocedurehis` (
    `id` int(11) NOT NULL AUTO_INCREMENT,
!   `demographic_no` int(11) NOT NULL DEFAULT '0',
!   `provider` varchar(60) DEFAULT NULL,
!   `date` date NOT NULL DEFAULT '0000-00-00',
!   `eye` varchar(2) NOT NULL DEFAULT '',
!   `procedure_name` varchar(100) NOT NULL DEFAULT '',
!   `procedure_type` varchar(30) DEFAULT NULL,
    `procedure_note` text,
!   `doctor` varchar(30) DEFAULT NULL,
!   `location` varchar(30) DEFAULT NULL,
!   `update_time` datetime DEFAULT NULL,
!   `status` varchar(2) DEFAULT 'A',
!   `appointment_no` int(11) DEFAULT NULL,
    PRIMARY KEY (`id`)
! ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
--- 63,80 ----
  CREATE TABLE `ocularprocedurehis` (
    `id` int(11) NOT NULL AUTO_INCREMENT,
!   `demographic_no` int(11) NOT NULL ,
!   `provider` varchar(60) ,
!   `date` date NOT NULL ,
!   `eye` varchar(2) NOT NULL ,
!   `procedure_name` varchar(100) NOT NULL ,
!   `procedure_type` varchar(30) ,
    `procedure_note` text,
!   `doctor` varchar(30) ,
!   `location` varchar(30) ,
!   `update_time` datetime ,
!   `status` varchar(2) ,
!   `appointment_no` int(11) ,
    PRIMARY KEY (`id`)
! ) ENGINE=InnoDB AUTO_INCREMENT=7 ;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
***************
*** 88,104 ****
  CREATE TABLE `procedurebook` (
    `id` int(11) NOT NULL AUTO_INCREMENT,
!   `eyeform_id` bigint(20) DEFAULT NULL,
!   `demographic_no` int(11) DEFAULT NULL,
!   `appointment_no` int(11) DEFAULT NULL,
!   `provider` varchar(60) DEFAULT NULL,
!   `procedure_name` varchar(30) DEFAULT NULL,
!   `eye` varchar(20) DEFAULT NULL,
!   `location` varchar(50) DEFAULT NULL,
!   `urgency` varchar(10) DEFAULT NULL,
    `comment` text,
!   `date` datetime DEFAULT NULL,
!   `status` varchar(2) DEFAULT 'A',
    PRIMARY KEY (`id`)
! ) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
--- 88,104 ----
  CREATE TABLE `procedurebook` (
    `id` int(11) NOT NULL AUTO_INCREMENT,
!   `eyeform_id` bigint(20) ,
!   `demographic_no` int(11) ,
!   `appointment_no` int(11) ,
!   `provider` varchar(60) ,
!   `procedure_name` varchar(30) ,
!   `eye` varchar(20) ,
!   `location` varchar(50) ,
!   `urgency` varchar(10) ,
    `comment` text,
!   `date` datetime ,
!   `status` varchar(2) ,
    PRIMARY KEY (`id`)
! ) ENGINE=InnoDB AUTO_INCREMENT=6 ;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
***************
*** 112,135 ****
  CREATE TABLE `specshis` (
    `id` int(11) NOT NULL AUTO_INCREMENT,
!   `demographic_no` int(11) NOT NULL DEFAULT '0',
!   `provider` varchar(60) DEFAULT NULL,
!   `date` date DEFAULT NULL,
!   `doctor` varchar(30) DEFAULT NULL,
!   `type` varchar(30) DEFAULT NULL,
!   `od_sph` varchar(10) DEFAULT NULL,
!   `od_cyl` varchar(10) DEFAULT NULL,
!   `od_axis` varchar(10) DEFAULT NULL,
!   `od_add` varchar(10) DEFAULT NULL,
!   `od_prism` varchar(10) DEFAULT NULL,
!   `os_sph` varchar(10) DEFAULT NULL,
!   `os_cyl` varchar(10) DEFAULT NULL,
!   `os_axis` varchar(10) DEFAULT NULL,
!   `os_add` varchar(10) DEFAULT NULL,
!   `os_prism` varchar(10) DEFAULT NULL,
!   `update_time` datetime DEFAULT NULL,
!   `status` varchar(2) DEFAULT 'A',
!   `appointment_no` int(11) DEFAULT NULL,
    PRIMARY KEY (`id`)
! ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
--- 112,135 ----
  CREATE TABLE `specshis` (
    `id` int(11) NOT NULL AUTO_INCREMENT,
!   `demographic_no` int(11) NOT NULL ,
!   `provider` varchar(60) ,
!   `date` date ,
!   `doctor` varchar(30) ,
!   `type` varchar(30) ,
!   `od_sph` varchar(10),
!   `od_cyl` varchar(10) ,
!   `od_axis` varchar(10) ,
!   `od_add` varchar(10) ,
!   `od_prism` varchar(10) ,
!   `os_sph` varchar(10) ,
!   `os_cyl` varchar(10) ,
!   `os_axis` varchar(10) ,
!   `os_add` varchar(10) ,
!   `os_prism` varchar(10) ,
!   `update_time` datetime ,
!   `status` varchar(2) ,
!   `appointment_no` int(11) ,
    PRIMARY KEY (`id`)
! ) ENGINE=InnoDB AUTO_INCREMENT=4;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
***************
*** 143,158 ****
  CREATE TABLE `testbookrecord` (
    `id` int(11) NOT NULL AUTO_INCREMENT,
!   `testname` varchar(60) DEFAULT NULL,
!   `appointment_no` int(11) DEFAULT NULL,
!   `demographic_no` int(11) DEFAULT NULL,
!   `provider` varchar(60) DEFAULT NULL,
!   `eyeform_id` bigint(20) DEFAULT NULL,
!   `eye` varchar(20) DEFAULT NULL,
!   `urgency` varchar(30) DEFAULT NULL,
!   `comment` varchar(100) DEFAULT NULL,
!   `date` datetime DEFAULT NULL,
!   `status` varchar(2) DEFAULT 'A',
    PRIMARY KEY (`id`)
! ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
  /*!40101 SET character_set_client = @saved_cs_client */;
  
--- 143,158 ----
  CREATE TABLE `testbookrecord` (
    `id` int(11) NOT NULL AUTO_INCREMENT,
!   `testname` varchar(60) ,
!   `appointment_no` int(11) ,
!   `demographic_no` int(11) ,
!   `provider` varchar(60) ,
!   `eyeform_id` bigint(20) ,
!   `eye` varchar(20) ,
!   `urgency` varchar(30) ,
!   `comment` varchar(100) ,
!   `date` datetime ,
!   `status` varchar(2) ,
    PRIMARY KEY (`id`)
! ) ENGINE=InnoDB AUTO_INCREMENT=3 ;
  /*!40101 SET character_set_client = @saved_cs_client */;
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/build grep_check_web.data, 1.3, 1.4

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13853/build

Modified Files:
	grep_check_web.data 
Log Message:
new baseline for remainning errors

Index: grep_check_web.data
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/grep_check_web.data,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsZajCi4 and /tmp/cvsWvCadY differ

[Oscarmcmaster-cvscommit] oscar_mcmaster/build/tasks/src GrepStuffAntTask.java, 1.3, 1.4

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13853/build/tasks/src

Modified Files:
	GrepStuffAntTask.java 
Log Message:
new baseline for remainning errors

Index: GrepStuffAntTask.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src/GrepStuffAntTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GrepStuffAntTask.java	24 Oct 2010 07:23:18 -0000	1.3
--- GrepStuffAntTask.java	10 Nov 2010 11:28:49 -0000	1.4
***************
*** 49,52 ****
--- 49,53 ----
  	public void execute() throws BuildException {
  		try {
+ 			log(DATA_SEPARATOR);
  			log(getClass().getName() + " starting with srcDir=" + srcDir + ", dataFile=" + dataFile);
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/build/tasks/src GrepStuffDirectoryWalker.java, 1.15, 1.16

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv12100/build/tasks/src

Modified Files:
	GrepStuffDirectoryWalker.java 
Log Message:
allow printStackTrace in javascript files

Index: GrepStuffDirectoryWalker.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src/GrepStuffDirectoryWalker.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** GrepStuffDirectoryWalker.java	10 Nov 2010 11:20:52 -0000	1.15
--- GrepStuffDirectoryWalker.java	10 Nov 2010 11:23:08 -0000	1.16
***************
*** 55,61 ****
  			checkContains(relativePath, fileContents, "System.err", "use log4j logger");
  			checkContains(relativePath, fileContents, "System.out", "use log4j logger");
- 			checkContains(relativePath, fileContents, "printStackTrace", "use log4j logger");
  			checkContains(relativePath, fileContents, "getConnection(", "use jpa");
  			
  			checkContains(relativePath, fileContents, "DBHandler.", "use jpa");
  			checkContains(relativePath, fileContents, "OscarSuperManager", "use jpa");
--- 55,64 ----
  			checkContains(relativePath, fileContents, "System.err", "use log4j logger");
  			checkContains(relativePath, fileContents, "System.out", "use log4j logger");
  			checkContains(relativePath, fileContents, "getConnection(", "use jpa");
  			
+ 			if (fileContents.contains("printStackTrace") && !relativePath.endsWith(".js")) {
+ 				violations.put("printStackTrace" + ", " + "use log4j logger", relativePath);
+ 			}
+ 			
  			checkContains(relativePath, fileContents, "DBHandler.", "use jpa");
  			checkContains(relativePath, fileContents, "OscarSuperManager", "use jpa");

[Oscarmcmaster-cvscommit] oscar_mcmaster/build/tasks/src GrepStuffDirectoryWalker.java, 1.14, 1.15

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11450/build/tasks/src

Modified Files:
	GrepStuffDirectoryWalker.java 
Log Message:
oops accidentally removed some checks, added back

Index: GrepStuffDirectoryWalker.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src/GrepStuffDirectoryWalker.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** GrepStuffDirectoryWalker.java	10 Nov 2010 11:15:58 -0000	1.14
--- GrepStuffDirectoryWalker.java	10 Nov 2010 11:20:52 -0000	1.15
***************
*** 52,55 ****
--- 52,61 ----
  
  			// --- case sensitive comparison ---
+ 			
+ 			checkContains(relativePath, fileContents, "System.err", "use log4j logger");
+ 			checkContains(relativePath, fileContents, "System.out", "use log4j logger");
+ 			checkContains(relativePath, fileContents, "printStackTrace", "use log4j logger");
+ 			checkContains(relativePath, fileContents, "getConnection(", "use jpa");
+ 			
  			checkContains(relativePath, fileContents, "DBHandler.", "use jpa");
  			checkContains(relativePath, fileContents, "OscarSuperManager", "use jpa");

[Oscarmcmaster-cvscommit] oscar_mcmaster/build/tasks/src GrepStuffDirectoryWalker.java, 1.13, 1.14

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9458/build/tasks/src

Modified Files:
	GrepStuffDirectoryWalker.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: GrepStuffDirectoryWalker.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src/GrepStuffDirectoryWalker.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GrepStuffDirectoryWalker.java	8 Nov 2010 23:57:01 -0000	1.13
--- GrepStuffDirectoryWalker.java	10 Nov 2010 11:15:58 -0000	1.14
***************
*** 42,92 ****
  		String fileContentsLowered = fileContents.toLowerCase();
  
! 		// --- filename checking ---
! 		if (relativePath.endsWith(".hbm.xml")) violations.put(".hbm.xml, stop using hibernate, use jpa & annotations instead", relativePath);
! 		if (relativePath.endsWith(".class")) violations.put(".class, don't commit compiled class files", relativePath);
! 		if (relativePath.endsWith(".PNG")) violations.put(".PNG, png should be lower case", relativePath);
! 		if (relativePath.endsWith(".JPG")) violations.put(".JPG, jpg should be lower case", relativePath);
! 		if (relativePath.endsWith(".GIF")) violations.put(".GIF, gif should be lower case", relativePath);
! 
! 		// --- case sensitive comparison ---
  
! 		// if it's not the oscar main code base ignore these items
! 		if (!file.getCanonicalPath().contains("/database/mysql/")) {
! 			checkContains(relativePath, fileContents, "System.err", "use log4j logger");
! 			checkContains(relativePath, fileContents, "System.out", "use log4j logger");
! 			checkContains(relativePath, fileContents, "printStackTrace", "use log4j logger");
! 			checkContains(relativePath, fileContents, "getConnection(", "use jpa");
! 		}
  
! 		checkContains(relativePath, fileContents, "DBHandler.", "use jpa");
! 		checkContains(relativePath, fileContents, "OscarSuperManager", "use jpa");
! 		checkContains(relativePath, fileContents, "org.apache.commons.logging.Log", "use log4j logger");
! 		checkContains(relativePath, fileContents, "com.sun.", "classes are not always available, usually org.apache will have standard libraries to replace these");
! 		checkContains(relativePath, fileContents, "LogManager.getLogger(", "use MiscUtils.getLogger() instead");
! 		checkContains(relativePath, fileContents, "HibernateDaoSupport", "use jpa");
! 		checkContains(relativePath, fileContents, "ArrayList()", "use generics");
! 		checkContains(relativePath, fileContents, "HashSet()", "use generics");
! 		checkContains(relativePath, fileContents, "HashMap()", "use generics");
! 		checkContains(relativePath, fileContents, "TreeSet()", "use generics");
! 		checkContains(relativePath, fileContents, "TreeMap()", "use generics");
! 		checkContains(relativePath, fileContents, "WeakHashMap()", "use generics");
! 		checkContains(relativePath, fileContents, "StringBuffer", "very very rare that this is required, usually StringBuilder is the better choice");
! 		checkContains(relativePath, fileContents, "com.Ostermiller", "use org.apache libraries instead, duplicated libs and apache is... more standard (if that's a word)");
  
! 		checkContains(relativePath, fileContents, "Vector", "excessively rare that this is required, usually ArrayList is the better choice");
  
! 		if (fileContents.contains("Hashtable") && !fileContents.contains("initHashtableWithList")) {
! 			violations.put("Hashtable" + ", " + "excessively rare that this is required, usually HashMap is the better choice", relativePath);
  		}
  
- 		// --- hack for ignore case comparison ---
- 		checkContains(relativePath, fileContentsLowered, "latin-1", "use utf-8");
- 		checkContains(relativePath, fileContentsLowered, "ascii", "use utf-8");
- 		checkContains(relativePath, fileContentsLowered, "8859-1", "use utf-8");
- 
  		// --- check for database sql problems ---
! 		if (relativePath.endsWith(".sql")) {
! 			if (fileContentsLowered.contains(" default ")) {
! 				violations.put("database 'default' should not be used, set the default in java in the jpa objects", relativePath);
  			}
  		}
--- 42,88 ----
  		String fileContentsLowered = fileContents.toLowerCase();
  
! 		// stuff to check if it's the oscar code base
! 		if (file.getCanonicalPath().contains("/web/")) {
! 			// --- filename checking ---
! 			if (relativePath.endsWith(".hbm.xml")) violations.put(".hbm.xml, stop using hibernate, use jpa & annotations instead", relativePath);
! 			if (relativePath.endsWith(".class")) violations.put(".class, don't commit compiled class files", relativePath);
! 			if (relativePath.endsWith(".PNG")) violations.put(".PNG, png should be lower case", relativePath);
! 			if (relativePath.endsWith(".JPG")) violations.put(".JPG, jpg should be lower case", relativePath);
! 			if (relativePath.endsWith(".GIF")) violations.put(".GIF, gif should be lower case", relativePath);
  
! 			// --- case sensitive comparison ---
! 			checkContains(relativePath, fileContents, "DBHandler.", "use jpa");
! 			checkContains(relativePath, fileContents, "OscarSuperManager", "use jpa");
! 			checkContains(relativePath, fileContents, "org.apache.commons.logging.Log", "use log4j logger");
! 			checkContains(relativePath, fileContents, "com.sun.", "classes are not always available, usually org.apache will have standard libraries to replace these");
! 			checkContains(relativePath, fileContents, "LogManager.getLogger(", "use MiscUtils.getLogger() instead");
! 			checkContains(relativePath, fileContents, "HibernateDaoSupport", "use jpa");
! 			checkContains(relativePath, fileContents, "ArrayList()", "use generics");
! 			checkContains(relativePath, fileContents, "HashSet()", "use generics");
! 			checkContains(relativePath, fileContents, "HashMap()", "use generics");
! 			checkContains(relativePath, fileContents, "TreeSet()", "use generics");
! 			checkContains(relativePath, fileContents, "TreeMap()", "use generics");
! 			checkContains(relativePath, fileContents, "WeakHashMap()", "use generics");
! 			checkContains(relativePath, fileContents, "StringBuffer", "very very rare that this is required, usually StringBuilder is the better choice");
! 			checkContains(relativePath, fileContents, "com.Ostermiller", "use org.apache libraries instead, duplicated libs and apache is... more standard (if that's a word)");
  
! 			checkContains(relativePath, fileContents, "Vector", "excessively rare that this is required, usually ArrayList is the better choice");
  
! 			if (fileContents.contains("Hashtable") && !fileContents.contains("initHashtableWithList")) {
! 				violations.put("Hashtable" + ", " + "excessively rare that this is required, usually HashMap is the better choice", relativePath);
! 			}
  
! 			// --- hack for ignore case comparison ---
! 			checkContains(relativePath, fileContentsLowered, "latin-1", "use utf-8");
! 			checkContains(relativePath, fileContentsLowered, "ascii", "use utf-8");
! 			checkContains(relativePath, fileContentsLowered, "8859-1", "use utf-8");
  		}
  
  		// --- check for database sql problems ---
! 		if (file.getCanonicalPath().contains("/database/")) {
! 			if (relativePath.endsWith(".sql")) {
! 				if (fileContentsLowered.contains(" default ")) {
! 					violations.put("database 'default' should not be used, set the default in java in the jpa objects", relativePath);
! 				}
  			}
  		}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/security SecurityDao.java, 1.3, 1.4 SecroleDao.java, 1.4, 1.5 SecProviderDao.java, 1.3, 1.4 SecobjprivilegeDao.java, 1.3, 1.4 SecuserroleDao.java, 1.4, 1.5

[Ted L. <ted...@us...>]

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-serv9458/web/WEB-INF/classes/src/com/quatro/dao/security

Modified Files:
	SecurityDao.java SecroleDao.java SecProviderDao.java 
	SecobjprivilegeDao.java SecuserroleDao.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: SecurityDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/security/SecurityDao.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SecurityDao.java	23 Jun 2009 18:35:38 -0000	1.3
--- SecurityDao.java	10 Nov 2010 11:15:58 -0000	1.4
***************
*** 14,24 ****
  
  import org.apache.commons.lang.StringEscapeUtils;
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
- import org.hibernate.Criteria;
  import org.hibernate.LockMode;
  import org.hibernate.Query;
  import org.hibernate.criterion.Example;
! //import org.oscarehr.PMmodule.model.Demographic;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  
--- 14,22 ----
  
  import org.apache.commons.lang.StringEscapeUtils;
  import org.apache.log4j.Logger;
  import org.hibernate.LockMode;
  import org.hibernate.Query;
  import org.hibernate.criterion.Example;
! import org.oscarehr.util.MiscUtils;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  
***************
*** 33,37 ****
  
  public class SecurityDao extends HibernateDaoSupport {
! 	private static final Logger log = LogManager.getLogger(SecurityDao.class);
  	// property constants
  	public static final String USER_NAME = "userName";
--- 31,35 ----
  
  public class SecurityDao extends HibernateDaoSupport {
! 	private static final Logger logger = MiscUtils.getLogger();
  	// property constants
  	public static final String USER_NAME = "userName";
***************
*** 46,50 ****
  	
  	public List getProfile(String providerNo) {
! 		log.debug("All User list");
  		try {
  			// String queryString = "select securityNo, userName, providerNo from Security";
--- 44,48 ----
  	
  	public List getProfile(String providerNo) {
! 		logger.debug("All User list");
  		try {
  			// String queryString = "select securityNo, userName, providerNo from Security";
***************
*** 64,68 ****
  			return this.getHibernateTemplate().find(queryString);
  		} catch (RuntimeException re) {
! 			log.error("find All User list failed", re);
  			throw re;
  		}
--- 62,66 ----
  			return this.getHibernateTemplate().find(queryString);
  		} catch (RuntimeException re) {
! 			logger.error("find All User list failed", re);
  			throw re;
  		}
***************
*** 70,74 ****
  	
  	public List getAllUsers() {
! 		log.debug("All User list");
  		try {
  			// String queryString = "select securityNo, userName, providerNo from Security";
--- 68,72 ----
  	
  	public List getAllUsers() {
! 		logger.debug("All User list");
  		try {
  			// String queryString = "select securityNo, userName, providerNo from Security";
***************
*** 80,84 ****
  			return this.getHibernateTemplate().find(queryString);
  		} catch (RuntimeException re) {
! 			log.error("find All User list failed", re);
  			throw re;
  		}
--- 78,82 ----
  			return this.getHibernateTemplate().find(queryString);
  		} catch (RuntimeException re) {
! 			logger.error("find All User list failed", re);
  			throw re;
  		}
***************
*** 86,90 ****
  	
  	public List search(UserSearchFormBean bean) {
! 		log.debug("User search");
  		try {
  
--- 84,88 ----
  	
  	public List search(UserSearchFormBean bean) {
! 		logger.debug("User search");
  		try {
  
***************
*** 177,181 ****
  			
  		} catch (RuntimeException re) {
! 			log.error("User search failed", re);
  			throw re;
  		}
--- 175,179 ----
  			
  		} catch (RuntimeException re) {
! 			logger.error("User search failed", re);
  			throw re;
  		}
***************
*** 184,193 ****
  	
  	public void save(Security transientInstance) {
! 		log.debug("saving Security instance");
  		try {
  			this.getHibernateTemplate().save(transientInstance);
! 			log.debug("save successful");
  		} catch (RuntimeException re) {
! 			log.error("save failed", re);
  			throw re;
  		}
--- 182,191 ----
  	
  	public void save(Security transientInstance) {
! 		logger.debug("saving Security instance");
  		try {
  			this.getHibernateTemplate().save(transientInstance);
! 			logger.debug("save successful");
  		} catch (RuntimeException re) {
! 			logger.error("save failed", re);
  			throw re;
  		}
***************
*** 195,204 ****
  	
  	public void saveOrUpdate(Security transientInstance) {
! 		log.debug("saving/update Security instance");
  		try {
  			this.getHibernateTemplate().saveOrUpdate(transientInstance);
! 			log.debug("save/update successful");
  		} catch (RuntimeException re) {
! 			log.error("save/update failed", re);
  			throw re;
  		}
--- 193,202 ----
  	
  	public void saveOrUpdate(Security transientInstance) {
! 		logger.debug("saving/update Security instance");
  		try {
  			this.getHibernateTemplate().saveOrUpdate(transientInstance);
! 			logger.debug("save/update successful");
  		} catch (RuntimeException re) {
! 			logger.error("save/update failed", re);
  			throw re;
  		}
***************
*** 206,215 ****
  
  	public void delete(Security persistentInstance) {
! 		log.debug("deleting Security instance");
  		try {
  			this.getHibernateTemplate().delete(persistentInstance);
! 			log.debug("delete successful");
  		} catch (RuntimeException re) {
! 			log.error("delete failed", re);
  			throw re;
  		}
--- 204,213 ----
  
  	public void delete(Security persistentInstance) {
! 		logger.debug("deleting Security instance");
  		try {
  			this.getHibernateTemplate().delete(persistentInstance);
! 			logger.debug("delete successful");
  		} catch (RuntimeException re) {
! 			logger.error("delete failed", re);
  			throw re;
  		}
***************
*** 217,221 ****
  
  	public Security findById(java.lang.Integer id) {
! 		log.debug("getting Security instance with id: " + id);
  		try {
  			Security instance = (Security) this.getHibernateTemplate().get(
--- 215,219 ----
  
  	public Security findById(java.lang.Integer id) {
! 		logger.debug("getting Security instance with id: " + id);
  		try {
  			Security instance = (Security) this.getHibernateTemplate().get(
***************
*** 223,227 ****
  			return instance;
  		} catch (RuntimeException re) {
! 			log.error("get failed", re);
  			throw re;
  		}
--- 221,225 ----
  			return instance;
  		} catch (RuntimeException re) {
! 			logger.error("get failed", re);
  			throw re;
  		}
***************
*** 229,242 ****
  
  	public List findByExample(Security instance) {
! 		log.debug("finding Security instance by example");
  		try {
  			List results =  getSession().createCriteria(
  					"com.quatro.model.security.Security").add(
  					Example.create(instance)).list();
! 			log.debug("find by example successful, result size: "
  					+ results.size());
  			return results;
  		} catch (RuntimeException re) {
! 			log.error("find by example failed", re);
  			throw re;
  		}
--- 227,240 ----
  
  	public List findByExample(Security instance) {
! 		logger.debug("finding Security instance by example");
  		try {
  			List results =  getSession().createCriteria(
  					"com.quatro.model.security.Security").add(
  					Example.create(instance)).list();
! 			logger.debug("find by example successful, result size: "
  					+ results.size());
  			return results;
  		} catch (RuntimeException re) {
! 			logger.error("find by example failed", re);
  			throw re;
  		}
***************
*** 244,248 ****
  
  	public List findByProperty(String propertyName, Object value) {
! 		log.debug("finding Security instance with property: " + propertyName
  				+ ", value: " + value);
  		try {
--- 242,246 ----
  
  	public List findByProperty(String propertyName, Object value) {
! 		logger.debug("finding Security instance with property: " + propertyName
  				+ ", value: " + value);
  		try {
***************
*** 253,257 ****
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			log.error("find by property name failed", re);
  			throw re;
  		}
--- 251,255 ----
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			logger.error("find by property name failed", re);
  			throw re;
  		}
***************
*** 285,289 ****
  
  	public List findAll() {
! 		log.debug("finding all Security instances");
  		try {
  			String queryString = "from Security";
--- 283,287 ----
  
  	public List findAll() {
! 		logger.debug("finding all Security instances");
  		try {
  			String queryString = "from Security";
***************
*** 291,295 ****
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			log.error("find all failed", re);
  			throw re;
  		}
--- 289,293 ----
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			logger.error("find all failed", re);
  			throw re;
  		}
***************
*** 297,307 ****
  
  	public Security merge(Security detachedInstance) {
! 		log.debug("merging Security instance");
  		try {
  			Security result = (Security) getSession().merge(detachedInstance);
! 			log.debug("merge successful");
  			return result;
  		} catch (RuntimeException re) {
! 			log.error("merge failed", re);
  			throw re;
  		}
--- 295,305 ----
  
  	public Security merge(Security detachedInstance) {
! 		logger.debug("merging Security instance");
  		try {
  			Security result = (Security) getSession().merge(detachedInstance);
! 			logger.debug("merge successful");
  			return result;
  		} catch (RuntimeException re) {
! 			logger.error("merge failed", re);
  			throw re;
  		}
***************
*** 309,318 ****
  
  	public void attachDirty(Security instance) {
! 		log.debug("attaching dirty Security instance");
  		try {
  			getSession().saveOrUpdate(instance);
! 			log.debug("attach successful");
  		} catch (RuntimeException re) {
! 			log.error("attach failed", re);
  			throw re;
  		}
--- 307,316 ----
  
  	public void attachDirty(Security instance) {
! 		logger.debug("attaching dirty Security instance");
  		try {
  			getSession().saveOrUpdate(instance);
! 			logger.debug("attach successful");
  		} catch (RuntimeException re) {
! 			logger.error("attach failed", re);
  			throw re;
  		}
***************
*** 320,329 ****
  
  	public void attachClean(Security instance) {
! 		log.debug("attaching clean Security instance");
  		try {
  			getSession().lock(instance, LockMode.NONE);
! 			log.debug("attach successful");
  		} catch (RuntimeException re) {
! 			log.error("attach failed", re);
  			throw re;
  		}
--- 318,327 ----
  
  	public void attachClean(Security instance) {
! 		logger.debug("attaching clean Security instance");
  		try {
  			getSession().lock(instance, LockMode.NONE);
! 			logger.debug("attach successful");
  		} catch (RuntimeException re) {
! 			logger.error("attach failed", re);
  			throw re;
  		}

Index: SecProviderDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/security/SecProviderDao.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SecProviderDao.java	23 Jun 2009 18:35:38 -0000	1.3
--- SecProviderDao.java	10 Nov 2010 11:15:58 -0000	1.4
***************
*** 13,22 ****
  import java.util.List;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.hibernate.LockMode;
  import org.hibernate.Query;
  import org.hibernate.criterion.Example;
! import org.oscarehr.PMmodule.model.Admission;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  
--- 13,21 ----
  import java.util.List;
  
  import org.apache.log4j.Logger;
  import org.hibernate.LockMode;
  import org.hibernate.Query;
  import org.hibernate.criterion.Example;
! import org.oscarehr.util.MiscUtils;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  
***************
*** 30,34 ****
  
  public class SecProviderDao extends HibernateDaoSupport {
! 	private static final Logger log = LogManager.getLogger(SecProviderDao.class);
  	// property constants
  	public static final String LAST_NAME = "lastName";
--- 29,33 ----
  
  public class SecProviderDao extends HibernateDaoSupport {
! 	private static final Logger logger = MiscUtils.getLogger();
  	// property constants
  	public static final String LAST_NAME = "lastName";
***************
*** 50,59 ****
  
  	public void save(SecProvider transientInstance) {
! 		log.debug("saving Provider instance");
  		try {
  			this.getHibernateTemplate().save(transientInstance);
! 			log.debug("save successful");
  		} catch (RuntimeException re) {
! 			log.error("save failed", re);
  			throw re;
  		}
--- 49,58 ----
  
  	public void save(SecProvider transientInstance) {
! 		logger.debug("saving Provider instance");
  		try {
  			this.getHibernateTemplate().save(transientInstance);
! 			logger.debug("save successful");
  		} catch (RuntimeException re) {
! 			logger.error("save failed", re);
  			throw re;
  		}
***************
*** 61,80 ****
  	
  	public void saveOrUpdate(SecProvider transientInstance) {
! 		log.debug("saving Provider instance");
  		try {
  			this.getHibernateTemplate().saveOrUpdate(transientInstance);
! 			log.debug("save successful");
  		} catch (RuntimeException re) {
! 			log.error("save failed", re);
  			throw re;
  		}
  	}
  	public void delete(SecProvider persistentInstance) {
! 		log.debug("deleting Provider instance");
  		try {
  			this.getHibernateTemplate().delete(persistentInstance);
! 			log.debug("delete successful");
  		} catch (RuntimeException re) {
! 			log.error("delete failed", re);
  			throw re;
  		}
--- 60,79 ----
  	
  	public void saveOrUpdate(SecProvider transientInstance) {
! 		logger.debug("saving Provider instance");
  		try {
  			this.getHibernateTemplate().saveOrUpdate(transientInstance);
! 			logger.debug("save successful");
  		} catch (RuntimeException re) {
! 			logger.error("save failed", re);
  			throw re;
  		}
  	}
  	public void delete(SecProvider persistentInstance) {
! 		logger.debug("deleting Provider instance");
  		try {
  			this.getHibernateTemplate().delete(persistentInstance);
! 			logger.debug("delete successful");
  		} catch (RuntimeException re) {
! 			logger.error("delete failed", re);
  			throw re;
  		}
***************
*** 82,86 ****
  
  	public SecProvider findById(java.lang.String id) {
! 		log.debug("getting Provider instance with id: " + id);
  		try {
  			SecProvider instance = (SecProvider) this.getHibernateTemplate().get(
--- 81,85 ----
  
  	public SecProvider findById(java.lang.String id) {
! 		logger.debug("getting Provider instance with id: " + id);
  		try {
  			SecProvider instance = (SecProvider) this.getHibernateTemplate().get(
***************
*** 88,97 ****
  			return instance;
  		} catch (RuntimeException re) {
! 			log.error("get failed", re);
  			throw re;
  		}
  	}
  	public SecProvider findById(java.lang.String id,String status) {
! 		log.debug("getting Provider instance with id: " + id);
  		try {
  			String sql ="from SecProvider where id=? and status=?";
--- 87,96 ----
  			return instance;
  		} catch (RuntimeException re) {
! 			logger.error("get failed", re);
  			throw re;
  		}
  	}
  	public SecProvider findById(java.lang.String id,String status) {
! 		logger.debug("getting Provider instance with id: " + id);
  		try {
  			String sql ="from SecProvider where id=? and status=?";
***************
*** 103,107 ****
  				
  			} catch (RuntimeException re) {
! 				log.error("get failed", re);
  			throw re;
  		}
--- 102,106 ----
  				
  			} catch (RuntimeException re) {
! 				logger.error("get failed", re);
  			throw re;
  		}
***************
*** 109,122 ****
  
  	public List findByExample(SecProviderDao instance) {
! 		log.debug("finding Provider instance by example");
  		try {
  			List results = getSession().createCriteria(
  					"com.quatro.model.security.SecProvider").add(
  					Example.create(instance)).list();
! 			log.debug("find by example successful, result size: "
  					+ results.size());
  			return results;
  		} catch (RuntimeException re) {
! 			log.error("find by example failed", re);
  			throw re;
  		}
--- 108,121 ----
  
  	public List findByExample(SecProviderDao instance) {
! 		logger.debug("finding Provider instance by example");
  		try {
  			List results = getSession().createCriteria(
  					"com.quatro.model.security.SecProvider").add(
  					Example.create(instance)).list();
! 			logger.debug("find by example successful, result size: "
  					+ results.size());
  			return results;
  		} catch (RuntimeException re) {
! 			logger.error("find by example failed", re);
  			throw re;
  		}
***************
*** 124,128 ****
  
  	public List findByProperty(String propertyName, Object value) {
! 		log.debug("finding Provider instance with property: " + propertyName
  				+ ", value: " + value);
  		try {
--- 123,127 ----
  
  	public List findByProperty(String propertyName, Object value) {
! 		logger.debug("finding Provider instance with property: " + propertyName
  				+ ", value: " + value);
  		try {
***************
*** 133,137 ****
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			log.error("find by property name failed", re);
  			throw re;
  		}
--- 132,136 ----
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			logger.error("find by property name failed", re);
  			throw re;
  		}
***************
*** 203,207 ****
  
  	public List findAll() {
! 		log.debug("finding all Provider instances");
  		try {
  			String queryString = "from Provider";
--- 202,206 ----
  
  	public List findAll() {
! 		logger.debug("finding all Provider instances");
  		try {
  			String queryString = "from Provider";
***************
*** 209,213 ****
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			log.error("find all failed", re);
  			throw re;
  		}
--- 208,212 ----
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			logger.error("find all failed", re);
  			throw re;
  		}
***************
*** 215,225 ****
  
  	public SecProviderDao merge(SecProviderDao detachedInstance) {
! 		log.debug("merging Provider instance");
  		try {
  			SecProviderDao result = (SecProviderDao) getSession().merge(detachedInstance);
! 			log.debug("merge successful");
  			return result;
  		} catch (RuntimeException re) {
! 			log.error("merge failed", re);
  			throw re;
  		}
--- 214,224 ----
  
  	public SecProviderDao merge(SecProviderDao detachedInstance) {
! 		logger.debug("merging Provider instance");
  		try {
  			SecProviderDao result = (SecProviderDao) getSession().merge(detachedInstance);
! 			logger.debug("merge successful");
  			return result;
  		} catch (RuntimeException re) {
! 			logger.error("merge failed", re);
  			throw re;
  		}
***************
*** 227,236 ****
  
  	public void attachDirty(SecProviderDao instance) {
! 		log.debug("attaching dirty Provider instance");
  		try {
  			getSession().saveOrUpdate(instance);
! 			log.debug("attach successful");
  		} catch (RuntimeException re) {
! 			log.error("attach failed", re);
  			throw re;
  		}
--- 226,235 ----
  
  	public void attachDirty(SecProviderDao instance) {
! 		logger.debug("attaching dirty Provider instance");
  		try {
  			getSession().saveOrUpdate(instance);
! 			logger.debug("attach successful");
  		} catch (RuntimeException re) {
! 			logger.error("attach failed", re);
  			throw re;
  		}
***************
*** 238,247 ****
  
  	public void attachClean(SecProviderDao instance) {
! 		log.debug("attaching clean Provider instance");
  		try {
  			getSession().lock(instance, LockMode.NONE);
! 			log.debug("attach successful");
  		} catch (RuntimeException re) {
! 			log.error("attach failed", re);
  			throw re;
  		}
--- 237,246 ----
  
  	public void attachClean(SecProviderDao instance) {
! 		logger.debug("attaching clean Provider instance");
  		try {
  			getSession().lock(instance, LockMode.NONE);
! 			logger.debug("attach successful");
  		} catch (RuntimeException re) {
! 			logger.error("attach failed", re);
  			throw re;
  		}

Index: SecobjprivilegeDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/security/SecobjprivilegeDao.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SecobjprivilegeDao.java	23 Jun 2009 18:35:38 -0000	1.3
--- SecobjprivilegeDao.java	10 Nov 2010 11:15:58 -0000	1.4
***************
*** 24,31 ****
  
  import java.util.List;
- import org.apache.log4j.LogManager;
- import org.apache.log4j.Logger;
  
  import org.hibernate.Query;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  
--- 24,31 ----
  
  import java.util.List;
  
+ import org.apache.log4j.Logger;
  import org.hibernate.Query;
+ import org.oscarehr.util.MiscUtils;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  
***************
*** 34,38 ****
  public class SecobjprivilegeDao extends HibernateDaoSupport {
  
!     private Logger log = LogManager.getLogger(SecobjprivilegeDao.class);
  
    
--- 34,38 ----
  public class SecobjprivilegeDao extends HibernateDaoSupport {
  
!     private Logger logger = MiscUtils.getLogger();
  
    
***************
*** 44,54 ****
          getHibernateTemplate().saveOrUpdate(secobjprivilege);
  
!         if (log.isDebugEnabled()) {
!             log.debug("SecobjprivilegeDao : save: " + secobjprivilege.getRoleusergroup() + ":" + secobjprivilege.getObjectname_desc());
          }
          
      }
      public void saveAll(List list) {
! 		log.debug("saving ALL Secobjprivilege instances");
  		try {
  			for(int i =0; i< list.size(); i++){
--- 44,54 ----
          getHibernateTemplate().saveOrUpdate(secobjprivilege);
  
!         if (logger.isDebugEnabled()) {
!             logger.debug("SecobjprivilegeDao : save: " + secobjprivilege.getRoleusergroup() + ":" + secobjprivilege.getObjectname_desc());
          }
          
      }
      public void saveAll(List list) {
! 		logger.debug("saving ALL Secobjprivilege instances");
  		try {
  			for(int i =0; i< list.size(); i++){
***************
*** 63,74 ****
  			}
  						
! 			log.debug("save ALL successful");
  		} catch (RuntimeException re) {
! 			log.error("save ALL failed", re);
  			throw re;
  		}
  	}
      public int update(Secobjprivilege instance) {
! 		log.debug("update Secobjprivilege instance");
  		try {
  			String queryString = "update Secobjprivilege as model set model.providerNo ='" + instance.getProviderNo() + "'"
--- 63,74 ----
  			}
  						
! 			logger.debug("save ALL successful");
  		} catch (RuntimeException re) {
! 			logger.error("save ALL failed", re);
  			throw re;
  		}
  	}
      public int update(Secobjprivilege instance) {
! 		logger.debug("update Secobjprivilege instance");
  		try {
  			String queryString = "update Secobjprivilege as model set model.providerNo ='" + instance.getProviderNo() + "'"
***************
*** 82,91 ****
  						
  		} catch (RuntimeException re) {
! 			log.error("Update failed", re);
  			throw re;
  		}
  	}
      public int deleteByRoleName(String roleName) {
! 		log.debug("deleting Secobjprivilege by roleName");
  		try {
  			
--- 82,91 ----
  						
  		} catch (RuntimeException re) {
! 			logger.error("Update failed", re);
  			throw re;
  		}
  	}
      public int deleteByRoleName(String roleName) {
! 		logger.debug("deleting Secobjprivilege by roleName");
  		try {
  			
***************
*** 93,108 ****
  			
  		} catch (RuntimeException re) {
! 			log.error("delete failed", re);
  			throw re;
  		}
  	}
      public void delete(Secobjprivilege persistentInstance) {
! 		log.debug("deleting Secobjprivilege instance");
  		try {
  			//getSession().delete(persistentInstance);
  			getHibernateTemplate().delete(persistentInstance);
! 			log.debug("delete successful");
  		} catch (RuntimeException re) {
! 			log.error("delete failed", re);
  			throw re;
  		}
--- 93,108 ----
  			
  		} catch (RuntimeException re) {
! 			logger.error("delete failed", re);
  			throw re;
  		}
  	}
      public void delete(Secobjprivilege persistentInstance) {
! 		logger.debug("deleting Secobjprivilege instance");
  		try {
  			//getSession().delete(persistentInstance);
  			getHibernateTemplate().delete(persistentInstance);
! 			logger.debug("delete successful");
  		} catch (RuntimeException re) {
! 			logger.error("delete failed", re);
  			throw re;
  		}
***************
*** 118,122 ****
  				return "";
  		} catch (RuntimeException re) {
! 			log.error("find by property name failed", re);
  			throw re;
  		}
--- 118,122 ----
  				return "";
  		} catch (RuntimeException re) {
! 			logger.error("find by property name failed", re);
  			throw re;
  		}
***************
*** 132,136 ****
  				return "";
  		} catch (RuntimeException re) {
! 			log.error("find by property name failed", re);
  			throw re;
  		}
--- 132,136 ----
  				return "";
  		} catch (RuntimeException re) {
! 			logger.error("find by property name failed", re);
  			throw re;
  		}
***************
*** 142,152 ****
          
          List result = findByProperty("roleusergroup", roleName);
!         if (log.isDebugEnabled()) {
!             log.debug("SecobjprivilegeDao : getFunctions: ");
          }
          return result;
      }
      public List findByProperty(String propertyName, Object value) {
! 		log.debug("finding Secobjprivilege instance with property: " + propertyName
  				+ ", value: " + value);
  		try {
--- 142,152 ----
          
          List result = findByProperty("roleusergroup", roleName);
!         if (logger.isDebugEnabled()) {
!             logger.debug("SecobjprivilegeDao : getFunctions: ");
          }
          return result;
      }
      public List findByProperty(String propertyName, Object value) {
! 		logger.debug("finding Secobjprivilege instance with property: " + propertyName
  				+ ", value: " + value);
  		try {
***************
*** 157,161 ****
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			log.error("find by property name failed", re);
  			throw re;
  		}
--- 157,161 ----
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			logger.error("find by property name failed", re);
  			throw re;
  		}

Index: SecroleDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/security/SecroleDao.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SecroleDao.java	13 Oct 2009 20:55:06 -0000	1.4
--- SecroleDao.java	10 Nov 2010 11:15:58 -0000	1.5
***************
*** 23,31 ****
  package com.quatro.dao.security;
  
- import java.util.ArrayList;
  import java.util.List;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  
--- 23,30 ----
  package com.quatro.dao.security;
  
  import java.util.List;
  
  import org.apache.log4j.Logger;
+ import org.oscarehr.util.MiscUtils;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  
***************
*** 34,43 ****
  public class SecroleDao extends HibernateDaoSupport {
  
!     private Logger log = LogManager.getLogger(SecroleDao.class);
  
      public List getRoles() {
          List results = this.getHibernateTemplate().find("from Secrole r order by roleName");
  
!         log.debug("getRoles: # of results=" + results.size());
  
          return results;
--- 33,42 ----
  public class SecroleDao extends HibernateDaoSupport {
  
!     private Logger logger = MiscUtils.getLogger();
  
      public List getRoles() {
          List results = this.getHibernateTemplate().find("from Secrole r order by roleName");
  
!         logger.debug("getRoles: # of results=" + results.size());
  
          return results;
***************
*** 51,55 ****
          Secrole result = (Secrole) this.getHibernateTemplate().get(Secrole.class, new Long(id));
  
!         log.debug("getRole: id=" + id + ",found=" + (result != null));
  
          return result;
--- 50,54 ----
          Secrole result = (Secrole) this.getHibernateTemplate().get(Secrole.class, new Long(id));
  
!         logger.debug("getRole: id=" + id + ",found=" + (result != null));
  
          return result;
***************
*** 66,70 ****
          	result = (Secrole) lst.get(0);
  
!         log.debug("getRoleByName: roleName=" + roleName + ",found=" + (result != null));
  
          return result;
--- 65,69 ----
          	result = (Secrole) lst.get(0);
  
!         logger.debug("getRoleByName: roleName=" + roleName + ",found=" + (result != null));
  
          return result;

Index: SecuserroleDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/dao/security/SecuserroleDao.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SecuserroleDao.java	17 Oct 2010 09:39:08 -0000	1.4
--- SecuserroleDao.java	10 Nov 2010 11:15:58 -0000	1.5
***************
*** 14,18 ****
  
  import org.apache.commons.lang.StringEscapeUtils;
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.hibernate.LockMode;
--- 14,17 ----
***************
*** 20,23 ****
--- 19,23 ----
  import org.hibernate.criterion.Example;
  import org.oscarehr.PMmodule.web.formbean.StaffForm;
+ import org.oscarehr.util.MiscUtils;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  
***************
*** 37,41 ****
  
  public class SecuserroleDao extends HibernateDaoSupport {
! 	private static final Logger log = LogManager.getLogger(SecuserroleDao.class);
  	// property constants
  	public static final String PROVIDER_NO = "providerNo";
--- 37,41 ----
  
  public class SecuserroleDao extends HibernateDaoSupport {
! 	private static final Logger logger = MiscUtils.getLogger();
  	// property constants
  	public static final String PROVIDER_NO = "providerNo";
***************
*** 45,49 ****
  
  	public void saveAll(List list) {
! 		log.debug("saving ALL Secuserrole instances");
  		try {
  			for(int i =0; i< list.size(); i++){
--- 45,49 ----
  
  	public void saveAll(List list) {
! 		logger.debug("saving ALL Secuserrole instances");
  		try {
  			for(int i =0; i< list.size(); i++){
***************
*** 58,74 ****
  			}
  			//this.getHibernateTemplate().saveOrUpdateAll(list);
! 			log.debug("save ALL successful");
  		} catch (RuntimeException re) {
! 			log.error("save ALL failed", re);
  			throw re;
  		}
  	}
  	public void save(Secuserrole transientInstance) {
! 		log.debug("saving Secuserrole instance");
  		try {
  			getSession().save(transientInstance);
! 			log.debug("save successful");
  		} catch (RuntimeException re) {
! 			log.error("save failed", re);
  			throw re;
  		}
--- 58,74 ----
  			}
  			//this.getHibernateTemplate().saveOrUpdateAll(list);
! 			logger.debug("save ALL successful");
  		} catch (RuntimeException re) {
! 			logger.error("save ALL failed", re);
  			throw re;
  		}
  	}
  	public void save(Secuserrole transientInstance) {
! 		logger.debug("saving Secuserrole instance");
  		try {
  			getSession().save(transientInstance);
! 			logger.debug("save successful");
  		} catch (RuntimeException re) {
! 			logger.error("save failed", re);
  			throw re;
  		}
***************
*** 76,90 ****
  	
  	public void delete(Secuserrole persistentInstance) {
! 		log.debug("deleting Secuserrole instance");
  		try {
  			getSession().delete(persistentInstance);
! 			log.debug("delete successful");
  		} catch (RuntimeException re) {
! 			log.error("delete failed", re);
  			throw re;
  		}
  	}
  	public int deleteByOrgcd(String orgcd) {
! 		log.debug("deleting Secuserrole by orgcd");
  		try {
  			
--- 76,90 ----
  	
  	public void delete(Secuserrole persistentInstance) {
! 		logger.debug("deleting Secuserrole instance");
  		try {
  			getSession().delete(persistentInstance);
! 			logger.debug("delete successful");
  		} catch (RuntimeException re) {
! 			logger.error("delete failed", re);
  			throw re;
  		}
  	}
  	public int deleteByOrgcd(String orgcd) {
! 		logger.debug("deleting Secuserrole by orgcd");
  		try {
  			
***************
*** 92,101 ****
  			
  		} catch (RuntimeException re) {
! 			log.error("delete failed", re);
  			throw re;
  		}
  	}
  	public int deleteByProviderNo(String providerNo) {
! 		log.debug("deleting Secuserrole by providerNo");
  		try {
  			
--- 92,101 ----
  			
  		} catch (RuntimeException re) {
! 			logger.error("delete failed", re);
  			throw re;
  		}
  	}
  	public int deleteByProviderNo(String providerNo) {
! 		logger.debug("deleting Secuserrole by providerNo");
  		try {
  			
***************
*** 103,107 ****
  			
  		} catch (RuntimeException re) {
! 			log.error("delete failed", re);
  			throw re;
  		}
--- 103,107 ----
  			
  		} catch (RuntimeException re) {
! 			logger.error("delete failed", re);
  			throw re;
  		}
***************
*** 109,113 ****
  	
  	public int deleteById(Integer id) {
! 		log.debug("deleting Secuserrole by ID");
  		try {
  			
--- 109,113 ----
  	
  	public int deleteById(Integer id) {
! 		logger.debug("deleting Secuserrole by ID");
  		try {
  			
***************
*** 115,124 ****
  			
  		} catch (RuntimeException re) {
! 			log.error("delete failed", re);
  			throw re;
  		}
  	}
  	public int update(Secuserrole instance) {
! 		log.debug("Update Secuserrole instance");
  		try {
  			String queryString = "update Secuserrole as model set model.activeyn ='" + instance.getActiveyn() + "'"
--- 115,124 ----
  			
  		} catch (RuntimeException re) {
! 			logger.error("delete failed", re);
  			throw re;
  		}
  	}
  	public int update(Secuserrole instance) {
! 		logger.debug("Update Secuserrole instance");
  		try {
  			String queryString = "update Secuserrole as model set model.activeyn ='" + instance.getActiveyn() + "'"
***************
*** 132,141 ****
  						
  		} catch (RuntimeException re) {
! 			log.error("Update failed", re);
  			throw re;
  		}
  	}
  	public Secuserrole findById(java.lang.Integer id) {
! 		log.debug("getting Secuserrole instance with id: " + id);
  		try {
  			Secuserrole instance = (Secuserrole) getSession().get(
--- 132,141 ----
  						
  		} catch (RuntimeException re) {
! 			logger.error("Update failed", re);
  			throw re;
  		}
  	}
  	public Secuserrole findById(java.lang.Integer id) {
! 		logger.debug("getting Secuserrole instance with id: " + id);
  		try {
  			Secuserrole instance = (Secuserrole) getSession().get(
***************
*** 143,147 ****
  			return instance;
  		} catch (RuntimeException re) {
! 			log.error("get failed", re);
  			throw re;
  		}
--- 143,147 ----
  			return instance;
  		} catch (RuntimeException re) {
! 			logger.error("get failed", re);
  			throw re;
  		}
***************
*** 149,162 ****
  
  	public List findByExample(Secuserrole instance) {
! 		log.debug("finding Secuserrole instance by example");
  		try {
  			List results = getSession().createCriteria(
  					"com.quatro.model.Secuserrole").add(
  					Example.create(instance)).list();
! 			log.debug("find by example successful, result size: "
  					+ results.size());
  			return results;
  		} catch (RuntimeException re) {
! 			log.error("find by example failed", re);
  			throw re;
  		}
--- 149,162 ----
  
  	public List findByExample(Secuserrole instance) {
! 		logger.debug("finding Secuserrole instance by example");
  		try {
  			List results = getSession().createCriteria(
  					"com.quatro.model.Secuserrole").add(
  					Example.create(instance)).list();
! 			logger.debug("find by example successful, result size: "
  					+ results.size());
  			return results;
  		} catch (RuntimeException re) {
! 			logger.error("find by example failed", re);
  			throw re;
  		}
***************
*** 164,168 ****
  
  	public List findByProperty(String propertyName, Object value) {
! 		log.debug("finding Secuserrole instance with property: " + propertyName
  				+ ", value: " + value);
  		try {
--- 164,168 ----
  
  	public List findByProperty(String propertyName, Object value) {
! 		logger.debug("finding Secuserrole instance with property: " + propertyName
  				+ ", value: " + value);
  		try {
***************
*** 173,177 ****
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			log.error("find by property name failed", re);
  			throw re;
  		}
--- 173,177 ----
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			logger.error("find by property name failed", re);
  			throw re;
  		}
***************
*** 195,199 ****
  		
  		*/
! 		log.debug("Find staff instance .");
  		try {
  			
--- 195,199 ----
  		
  		*/
! 		logger.debug("Find staff instance .");
  		try {
  			
***************
*** 210,214 ****
  			
  		} catch (RuntimeException re) {
! 			log.error("Find staff failed", re);
  			throw re;
  		}
--- 210,214 ----
  			
  		} catch (RuntimeException re) {
! 			logger.error("Find staff failed", re);
  			throw re;
  		}
***************
*** 217,221 ****
  	public List searchByCriteria(StaffForm staffForm){
  		
! 		log.debug("Search staff instance .");
  		try {
  			
--- 217,221 ----
  	public List searchByCriteria(StaffForm staffForm){
  		
! 		logger.debug("Search staff instance .");
  		try {
  			
***************
*** 249,253 ****
  			
  		} catch (RuntimeException re) {
! 			log.error("Search staff failed", re);
  			throw re;
  		}
--- 249,253 ----
  			
  		} catch (RuntimeException re) {
! 			logger.error("Search staff failed", re);
  			throw re;
  		}
***************
*** 259,263 ****
  
  	public List findAll() {
! 		log.debug("finding all Secuserrole instances");
  		try {
  			String queryString = "from Secuserrole";
--- 259,263 ----
  
  	public List findAll() {
! 		logger.debug("finding all Secuserrole instances");
  		try {
  			String queryString = "from Secuserrole";
***************
*** 265,269 ****
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			log.error("find all failed", re);
  			throw re;
  		}
--- 265,269 ----
  			return queryObject.list();
  		} catch (RuntimeException re) {
! 			logger.error("find all failed", re);
  			throw re;
  		}
***************
*** 271,282 ****
  
  	public Secuserrole merge(Secuserrole detachedInstance) {
! 		log.debug("merging Secuserrole instance");
  		try {
  			Secuserrole result = (Secuserrole) getSession().merge(
  					detachedInstance);
! 			log.debug("merge successful");
  			return result;
  		} catch (RuntimeException re) {
! 			log.error("merge failed", re);
  			throw re;
  		}
--- 271,282 ----
  
  	public Secuserrole merge(Secuserrole detachedInstance) {
! 		logger.debug("merging Secuserrole instance");
  		try {
  			Secuserrole result = (Secuserrole) getSession().merge(
  					detachedInstance);
! 			logger.debug("merge successful");
  			return result;
  		} catch (RuntimeException re) {
! 			logger.error("merge failed", re);
  			throw re;
  		}
***************
*** 284,293 ****
  
  	public void attachDirty(Secuserrole instance) {
! 		log.debug("attaching dirty Secuserrole instance");
  		try {
  			getSession().saveOrUpdate(instance);
! 			log.debug("attach successful");
  		} catch (RuntimeException re) {
! 			log.error("attach failed", re);
  			throw re;
  		}
--- 284,293 ----
  
  	public void attachDirty(Secuserrole instance) {
! 		logger.debug("attaching dirty Secuserrole instance");
  		try {
  			getSession().saveOrUpdate(instance);
! 			logger.debug("attach successful");
  		} catch (RuntimeException re) {
! 			logger.error("attach failed", re);
  			throw re;
  		}
***************
*** 295,304 ****
  
  	public void attachClean(Secuserrole instance) {
! 		log.debug("attaching clean Secuserrole instance");
  		try {
  			getSession().lock(instance, LockMode.NONE);
! 			log.debug("attach successful");
  		} catch (RuntimeException re) {
! 			log.error("attach failed", re);
  			throw re;
  		}
--- 295,304 ----
  
  	public void attachClean(Secuserrole instance) {
! 		logger.debug("attaching clean Secuserrole instance");
  		try {
  			getSession().lock(instance, LockMode.NONE);
! 			logger.debug("attach successful");
  		} catch (RuntimeException re) {
! 			logger.error("attach failed", re);
  			throw re;
  		}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/PMmodule/ClientManager manage_hnr_client_action.jsp, 1.8, 1.9

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9458/web/PMmodule/ClientManager

Modified Files:
	manage_hnr_client_action.jsp 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: manage_hnr_client_action.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/PMmodule/ClientManager/manage_hnr_client_action.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** manage_hnr_client_action.jsp	9 Jun 2009 16:15:24 -0000	1.8
--- manage_hnr_client_action.jsp	10 Nov 2010 11:15:58 -0000	1.9
***************
*** 1,3 ****
--- 1,4 ----
  
+ <%@page import="org.oscarehr.util.MiscUtils"%>
  <%@page import="org.oscarehr.caisi_integrator.ws.ConnectException_Exception"%>
  <%@page import="org.oscarehr.util.WebUtils"%>
***************
*** 75,79 ****
  	else
  	{
! 		LogManager.getLogger(this.getClass()).error("Unexpected action. qs="+request.getQueryString());
  	}
  	
--- 76,80 ----
  	else
  	{
! 		MiscUtils.getLogger().error("Unexpected action. qs="+request.getQueryString());
  	}
  	

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/oscarRx StaticScriptBean.java, 1.10, 1.11

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/oscarRx
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9458/web/WEB-INF/classes/src/org/oscarehr/oscarRx

Modified Files:
	StaticScriptBean.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: StaticScriptBean.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/oscarRx/StaticScriptBean.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** StaticScriptBean.java	24 Mar 2010 17:57:18 -0000	1.10
--- StaticScriptBean.java	10 Nov 2010 11:15:58 -0000	1.11
***************
*** 9,13 ****
  
  import org.apache.commons.lang.StringUtils;
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
--- 9,12 ----
***************
*** 20,23 ****
--- 19,23 ----
  import org.oscarehr.common.model.Drug;
  import org.oscarehr.util.LoggedInInfo;
+ import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.SpringUtils;
  
***************
*** 27,31 ****
  
  public class StaticScriptBean {
! 	private static final Logger logger = LogManager.getLogger(StaticScriptBean.class);
  	private static DrugDao drugDao = (DrugDao) SpringUtils.getBean("drugDao");
  
--- 27,31 ----
  
  public class StaticScriptBean {
! 	private static final Logger logger = MiscUtils.getLogger();
  	private static DrugDao drugDao = (DrugDao) SpringUtils.getBean("drugDao");
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/dao ClientImageDAO.java, 1.9, 1.10

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/dao
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9458/web/WEB-INF/classes/src/org/oscarehr/casemgmt/dao

Modified Files:
	ClientImageDAO.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: ClientImageDAO.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/dao/ClientImageDAO.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ClientImageDAO.java	4 Dec 2009 22:19:51 -0000	1.9
--- ClientImageDAO.java	10 Nov 2010 11:15:57 -0000	1.10
***************
*** 29,35 ****
  
  import org.apache.commons.lang.time.DateUtils;
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.oscarehr.casemgmt.model.ClientImage;
  import org.oscarehr.util.TimeClearedHashMap;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
--- 29,35 ----
  
  import org.apache.commons.lang.time.DateUtils;
  import org.apache.log4j.Logger;
  import org.oscarehr.casemgmt.model.ClientImage;
+ import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.TimeClearedHashMap;
  import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
***************
*** 40,44 ****
  public class ClientImageDAO extends HibernateDaoSupport {
  
! 	private static final Logger logger = LogManager.getLogger(ClientImageDAO.class);
  
  	/**
--- 40,44 ----
  public class ClientImageDAO extends HibernateDaoSupport {
  
! 	private static final Logger logger = MiscUtils.getLogger();
  
  	/**

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/popup ProcedimentoAction.java, 1.5, 1.6 AtividadeSaudeAction.java, 1.6, 1.7 CidAction.java, 1.5, 1.6

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/popup
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9458/web/WEB-INF/classes/src/oscar/billing/popup

Modified Files:
	ProcedimentoAction.java AtividadeSaudeAction.java 
	CidAction.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: ProcedimentoAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/popup/ProcedimentoAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ProcedimentoAction.java	28 Jul 2010 22:18:24 -0000	1.5
--- ProcedimentoAction.java	10 Nov 2010 11:15:58 -0000	1.6
***************
*** 29,37 ****
  import javax.servlet.http.HttpServletResponse;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionMapping;
  
  import oscar.billing.cad.dao.CadProcedimentoDAO;
--- 29,37 ----
  import javax.servlet.http.HttpServletResponse;
  
  import org.apache.log4j.Logger;
  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.billing.cad.dao.CadProcedimentoDAO;
***************
*** 40,44 ****
  
  public class ProcedimentoAction extends OscarAction {
!     private static Logger logger = LogManager.getLogger(ProcedimentoAction.class);
  
      public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
--- 40,44 ----
  
  public class ProcedimentoAction extends OscarAction {
!     private static Logger logger = MiscUtils.getLogger();
  
      public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {

Index: AtividadeSaudeAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/popup/AtividadeSaudeAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AtividadeSaudeAction.java	28 Jul 2010 22:18:24 -0000	1.6
--- AtividadeSaudeAction.java	10 Nov 2010 11:15:58 -0000	1.7
***************
*** 29,37 ****
  import javax.servlet.http.HttpServletResponse;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionMapping;
  
  import oscar.billing.cad.dao.CadAtividadeSaudeDAO;
--- 29,37 ----
  import javax.servlet.http.HttpServletResponse;
  
  import org.apache.log4j.Logger;
  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.billing.cad.dao.CadAtividadeSaudeDAO;
***************
*** 41,45 ****
  
  public class AtividadeSaudeAction extends OscarAction {
!     private static Logger logger = LogManager.getLogger(AtividadeSaudeAction.class);
  
      public ActionForward execute(ActionMapping mapping, ActionForm form,
--- 41,45 ----
  
  public class AtividadeSaudeAction extends OscarAction {
!     private static Logger logger = MiscUtils.getLogger();
  
      public ActionForward execute(ActionMapping mapping, ActionForm form,

Index: CidAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/popup/CidAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CidAction.java	28 Jul 2010 22:18:24 -0000	1.5
--- CidAction.java	10 Nov 2010 11:15:58 -0000	1.6
***************
*** 29,37 ****
  import javax.servlet.http.HttpServletResponse;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionMapping;
  
  import oscar.billing.cad.dao.CidDAO;
--- 29,37 ----
  import javax.servlet.http.HttpServletResponse;
  
  import org.apache.log4j.Logger;
  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.billing.cad.dao.CidDAO;
***************
*** 41,45 ****
  
  public class CidAction extends OscarAction {
!     private static Logger logger = LogManager.getLogger(CidAction.class);
  
      public ActionForward execute(ActionMapping mapping, ActionForm form,
--- 41,45 ----
  
  public class CidAction extends OscarAction {
!     private static Logger logger = MiscUtils.getLogger();
  
      public ActionForward execute(ActionMapping mapping, ActionForm form,

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/caisi_integrator CaisiIntegratorUpdateTask.java, 1.124, 1.125

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/caisi_integrator
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9458/web/WEB-INF/classes/src/org/oscarehr/PMmodule/caisi_integrator

Modified Files:
	CaisiIntegratorUpdateTask.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: CaisiIntegratorUpdateTask.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/caisi_integrator/CaisiIntegratorUpdateTask.java,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** CaisiIntegratorUpdateTask.java	2 Nov 2010 21:43:10 -0000	1.124
--- CaisiIntegratorUpdateTask.java	10 Nov 2010 11:15:58 -0000	1.125
***************
*** 38,42 ****
  
  import org.apache.commons.beanutils.BeanUtils;
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.oscarehr.PMmodule.dao.AdmissionDao;
--- 38,41 ----
***************
*** 133,137 ****
  public class CaisiIntegratorUpdateTask extends TimerTask {
  
! 	private static final Logger logger = LogManager.getLogger(CaisiIntegratorUpdateTask.class);
  
  	private static final String INTEGRATOR_UPDATE_PERIOD_PROPERTIES_KEY = "INTEGRATOR_UPDATE_PERIOD";
--- 132,136 ----
  public class CaisiIntegratorUpdateTask extends TimerTask {
  
! 	private static final Logger logger = MiscUtils.getLogger();
  
  	private static final String INTEGRATOR_UPDATE_PERIOD_PROPERTIES_KEY = "INTEGRATOR_UPDATE_PERIOD";

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web ManageConsentAction.java, 1.19, 1.20 PopulationReportUIBean.java, 1.15, 1.16 ClientManagerAction.java, 1.173, 1.174 ManageLinkedClients.java, 1.26, 1.27 ManageHnrClientAction.java, 1.26, 1.27 ManageLinkedClientsAction.java, 1.7, 1.8 ManageHnrClient.java, 1.19, 1.20

[Ted L. <ted...@us...>]

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-serv9458/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web

Modified Files:
	ManageConsentAction.java PopulationReportUIBean.java 
	ClientManagerAction.java ManageLinkedClients.java 
	ManageHnrClientAction.java ManageLinkedClientsAction.java 
	ManageHnrClient.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: PopulationReportUIBean.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/PopulationReportUIBean.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PopulationReportUIBean.java	9 Sep 2009 13:18:19 -0000	1.15
--- PopulationReportUIBean.java	10 Nov 2010 11:15:57 -0000	1.16
***************
*** 28,32 ****
  import java.util.TreeSet;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.caisi.model.Role;
--- 28,31 ----
***************
*** 48,56 ****
  import org.oscarehr.common.model.SecRole;
  import org.oscarehr.util.EncounterUtil;
  import org.oscarehr.util.SpringUtils;
  
  public class PopulationReportUIBean {
  
! 	private static Logger logger=LogManager.getLogger(PopulationReportUIBean.class);
  	private ProgramDao programDao = (ProgramDao) SpringUtils.getBean("programDao");
  	private RoleDAO roleDAO = (RoleDAO) SpringUtils.getBean("roleDAO");
--- 47,56 ----
  import org.oscarehr.common.model.SecRole;
  import org.oscarehr.util.EncounterUtil;
+ import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.SpringUtils;
  
  public class PopulationReportUIBean {
  
! 	private static Logger logger=MiscUtils.getLogger();
  	private ProgramDao programDao = (ProgramDao) SpringUtils.getBean("programDao");
  	private RoleDAO roleDAO = (RoleDAO) SpringUtils.getBean("roleDAO");

Index: ManageHnrClientAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/ManageHnrClientAction.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ManageHnrClientAction.java	15 Jun 2009 17:41:19 -0000	1.26
--- ManageHnrClientAction.java	10 Nov 2010 11:15:57 -0000	1.27
***************
*** 5,9 ****
  import java.util.List;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
--- 5,8 ----
***************
*** 23,30 ****
  import org.oscarehr.hnr.ws.Gender;
  import org.oscarehr.util.LoggedInInfo;
  import org.oscarehr.util.SpringUtils;
  
  public class ManageHnrClientAction {
! 	private static Logger logger = LogManager.getLogger(ManageHnrClientAction.class);
  	private static DemographicDao demographicDao = (DemographicDao) SpringUtils.getBean("demographicDao");
  	private static ClientLinkDao clientLinkDao = (ClientLinkDao) SpringUtils.getBean("clientLinkDao");
--- 22,30 ----
  import org.oscarehr.hnr.ws.Gender;
  import org.oscarehr.util.LoggedInInfo;
+ import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.SpringUtils;
  
  public class ManageHnrClientAction {
! 	private static Logger logger = MiscUtils.getLogger();
  	private static DemographicDao demographicDao = (DemographicDao) SpringUtils.getBean("demographicDao");
  	private static ClientLinkDao clientLinkDao = (ClientLinkDao) SpringUtils.getBean("clientLinkDao");

Index: ManageHnrClient.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/ManageHnrClient.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ManageHnrClient.java	8 Dec 2009 19:43:46 -0000	1.19
--- ManageHnrClient.java	10 Nov 2010 11:15:57 -0000	1.20
***************
*** 4,8 ****
  
  import org.apache.commons.lang.time.DateFormatUtils;
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
--- 4,7 ----
***************
*** 20,27 ****
  import org.oscarehr.ui.servlet.ImageRenderingServlet;
  import org.oscarehr.util.LoggedInInfo;
  import org.oscarehr.util.SpringUtils;
  
  public class ManageHnrClient {
! 	private static Logger logger = LogManager.getLogger(ManageHnrClient.class);
  	private static DemographicDao demographicDao = (DemographicDao) SpringUtils.getBean("demographicDao");
  	private static ClientLinkDao clientLinkDao = (ClientLinkDao) SpringUtils.getBean("clientLinkDao");
--- 19,27 ----
  import org.oscarehr.ui.servlet.ImageRenderingServlet;
  import org.oscarehr.util.LoggedInInfo;
+ import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.SpringUtils;
  
  public class ManageHnrClient {
! 	private static Logger logger = MiscUtils.getLogger();
  	private static DemographicDao demographicDao = (DemographicDao) SpringUtils.getBean("demographicDao");
  	private static ClientLinkDao clientLinkDao = (ClientLinkDao) SpringUtils.getBean("clientLinkDao");

Index: ClientManagerAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/ClientManagerAction.java,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -d -r1.173 -r1.174
*** ClientManagerAction.java	9 Jul 2010 21:56:35 -0000	1.173
--- ClientManagerAction.java	10 Nov 2010 11:15:57 -0000	1.174
***************
*** 123,127 ****
  public class ClientManagerAction extends BaseAction {
  
! 	private static final Logger logger = org.apache.log4j.LogManager.getLogger(ClientManagerAction.class);
  
  	private HealthSafetyManager healthSafetyManager;
--- 123,127 ----
  public class ClientManagerAction extends BaseAction {
  
! 	private static final Logger logger = MiscUtils.getLogger();
  
  	private HealthSafetyManager healthSafetyManager;

Index: ManageLinkedClients.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/ManageLinkedClients.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ManageLinkedClients.java	18 Aug 2009 17:56:15 -0000	1.26
--- ManageLinkedClients.java	10 Nov 2010 11:15:57 -0000	1.27
***************
*** 10,14 ****
  import org.apache.commons.lang.StringUtils;
  import org.apache.commons.lang.time.DateFormatUtils;
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
--- 10,13 ----
***************
*** 29,36 ****
  import org.oscarehr.ui.servlet.ImageRenderingServlet;
  import org.oscarehr.util.LoggedInInfo;
  import org.oscarehr.util.SpringUtils;
  
  public class ManageLinkedClients {
! 	public static Logger logger = LogManager.getLogger(ManageLinkedClients.class);
  	public static DemographicDao demographicDao = (DemographicDao) SpringUtils.getBean("demographicDao");
  	public static ClientLinkDao clientLinkDao = (ClientLinkDao) SpringUtils.getBean("clientLinkDao");
--- 28,36 ----
  import org.oscarehr.ui.servlet.ImageRenderingServlet;
  import org.oscarehr.util.LoggedInInfo;
+ import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.SpringUtils;
  
  public class ManageLinkedClients {
! 	public static Logger logger = MiscUtils.getLogger();
  	public static DemographicDao demographicDao = (DemographicDao) SpringUtils.getBean("demographicDao");
  	public static ClientLinkDao clientLinkDao = (ClientLinkDao) SpringUtils.getBean("clientLinkDao");

Index: ManageConsentAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/ManageConsentAction.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ManageConsentAction.java	25 Oct 2010 22:29:32 -0000	1.19
--- ManageConsentAction.java	10 Nov 2010 11:15:57 -0000	1.20
***************
*** 6,10 ****
  import java.util.GregorianCalendar;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
--- 6,9 ----
***************
*** 15,22 ****
  import org.oscarehr.util.DigitalSignatureUtils;
  import org.oscarehr.util.LoggedInInfo;
  import org.oscarehr.util.SpringUtils;
  
  public class ManageConsentAction {
! 	private static Logger logger = LogManager.getLogger(ManageConsentAction.class);
  	private static IntegratorConsentDao integratorConsentDao = (IntegratorConsentDao) SpringUtils.getBean("integratorConsentDao");
  
--- 14,22 ----
  import org.oscarehr.util.DigitalSignatureUtils;
  import org.oscarehr.util.LoggedInInfo;
+ import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.SpringUtils;
  
  public class ManageConsentAction {
! 	private static Logger logger = MiscUtils.getLogger();
  	private static IntegratorConsentDao integratorConsentDao = (IntegratorConsentDao) SpringUtils.getBean("integratorConsentDao");
  

Index: ManageLinkedClientsAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/ManageLinkedClientsAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ManageLinkedClientsAction.java	10 Jun 2009 17:16:57 -0000	1.7
--- ManageLinkedClientsAction.java	10 Nov 2010 11:15:57 -0000	1.8
***************
*** 6,10 ****
  import java.util.List;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
--- 6,9 ----
***************
*** 16,23 ****
  import org.oscarehr.common.model.FacilityDemographicPrimaryKey;
  import org.oscarehr.common.model.Provider;
  import org.oscarehr.util.SpringUtils;
  
  public class ManageLinkedClientsAction {
! 	public static Logger logger = LogManager.getLogger(ManageLinkedClientsAction.class);
  	public static ClientLinkDao clientLinkDao = (ClientLinkDao) SpringUtils.getBean("clientLinkDao");
  
--- 15,23 ----
  import org.oscarehr.common.model.FacilityDemographicPrimaryKey;
  import org.oscarehr.common.model.Provider;
+ import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.SpringUtils;
  
  public class ManageLinkedClientsAction {
! 	public static Logger logger = MiscUtils.getLogger();
  	public static ClientLinkDao clientLinkDao = (ClientLinkDao) SpringUtils.getBean("clientLinkDao");
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/web ProviderServiceReportUIBean.java, 1.7, 1.8

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/web
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9458/web/WEB-INF/classes/src/org/oscarehr/web

Modified Files:
	ProviderServiceReportUIBean.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: ProviderServiceReportUIBean.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/web/ProviderServiceReportUIBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ProviderServiceReportUIBean.java	29 Oct 2008 01:48:10 -0000	1.7
--- ProviderServiceReportUIBean.java	10 Nov 2010 11:15:58 -0000	1.8
***************
*** 28,32 ****
  import java.util.List;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.caisi.model.Role;
--- 28,31 ----
***************
*** 41,45 ****
  public class ProviderServiceReportUIBean {
  
! 	Logger logger = LogManager.getLogger(ProviderServiceReportUIBean.class);
  
  	private ProgramDao programDao = (ProgramDao) SpringUtils.getBean("programDao");
--- 40,44 ----
  public class ProviderServiceReportUIBean {
  
! 	private static Logger logger = MiscUtils.getLogger();
  
  	private ProgramDao programDao = (ProgramDao) SpringUtils.getBean("programDao");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/ui/servlet ImageRenderingServlet.java, 1.19, 1.20

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/ui/servlet
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9458/web/WEB-INF/classes/src/org/oscarehr/ui/servlet

Modified Files:
	ImageRenderingServlet.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: ImageRenderingServlet.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/ui/servlet/ImageRenderingServlet.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ImageRenderingServlet.java	20 Oct 2010 20:15:24 -0000	1.19
--- ImageRenderingServlet.java	10 Nov 2010 11:15:58 -0000	1.20
***************
*** 13,17 ****
  
  import org.apache.commons.io.IOUtils;
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
--- 13,16 ----
***************
*** 23,26 ****
--- 22,26 ----
  import org.oscarehr.common.model.Provider;
  import org.oscarehr.util.DigitalSignatureUtils;
+ import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.SessionConstants;
  import org.oscarehr.util.SpringUtils;
***************
*** 38,42 ****
   */
  public final class ImageRenderingServlet extends HttpServlet {
! 	private static Logger logger = LogManager.getLogger(ImageRenderingServlet.class);
  	private static ClientImageDAO clientImageDAO = (ClientImageDAO) SpringUtils.getBean("clientImageDAO");
  	private static DigitalSignatureDao digitalSignatureDao = (DigitalSignatureDao) SpringUtils.getBean("digitalSignatureDao");
--- 38,42 ----
   */
  public final class ImageRenderingServlet extends HttpServlet {
! 	private static Logger logger = MiscUtils.getLogger();
  	private static ClientImageDAO clientImageDAO = (ClientImageDAO) SpringUtils.getBean("clientImageDAO");
  	private static DigitalSignatureDao digitalSignatureDao = (DigitalSignatureDao) SpringUtils.getBean("digitalSignatureDao");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/controler ConsultaFaturamentoPacienteAction.java, 1.6, 1.7 ProcedimentoRealizadoAction.java, 1.12, 1.13 ConsultaFaturamentoMedicoAction.java, 1.5, 1.6

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/controler
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9458/web/WEB-INF/classes/src/oscar/billing/controler

Modified Files:
	ConsultaFaturamentoPacienteAction.java 
	ProcedimentoRealizadoAction.java 
	ConsultaFaturamentoMedicoAction.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: ProcedimentoRealizadoAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/controler/ProcedimentoRealizadoAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ProcedimentoRealizadoAction.java	28 Jul 2010 22:18:24 -0000	1.12
--- ProcedimentoRealizadoAction.java	10 Nov 2010 11:15:57 -0000	1.13
***************
*** 31,39 ****
  import javax.servlet.http.HttpSession;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionMapping;
  
  import oscar.billing.cad.dao.CadProcedimentoDAO;
--- 31,39 ----
  import javax.servlet.http.HttpSession;
  
  import org.apache.log4j.Logger;
  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.billing.cad.dao.CadProcedimentoDAO;
***************
*** 51,55 ****
  
  public class ProcedimentoRealizadoAction extends OscarAction {
!     private static Logger logger = LogManager.getLogger(ProcedimentoRealizadoAction.class);
  
      public ActionForward execute(ActionMapping mapping, ActionForm form,
--- 51,55 ----
  
  public class ProcedimentoRealizadoAction extends OscarAction {
!     private static Logger logger = MiscUtils.getLogger();
  
      public ActionForward execute(ActionMapping mapping, ActionForm form,

Index: ConsultaFaturamentoPacienteAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/controler/ConsultaFaturamentoPacienteAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ConsultaFaturamentoPacienteAction.java	28 Jul 2010 22:18:24 -0000	1.6
--- ConsultaFaturamentoPacienteAction.java	10 Nov 2010 11:15:57 -0000	1.7
***************
*** 27,35 ****
  import javax.servlet.http.HttpServletResponse;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionMapping;
  
  import oscar.billing.dao.AppointmentDAO;
--- 27,35 ----
  import javax.servlet.http.HttpServletResponse;
  
  import org.apache.log4j.Logger;
  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.billing.dao.AppointmentDAO;
***************
*** 39,43 ****
  
  public class ConsultaFaturamentoPacienteAction extends OscarAction {
!     private static Logger logger = LogManager.getLogger(ConsultaFaturamentoPacienteAction.class);
  
      public ActionForward execute(ActionMapping mapping, ActionForm form,
--- 39,43 ----
  
  public class ConsultaFaturamentoPacienteAction extends OscarAction {
!     private static Logger logger = MiscUtils.getLogger();
  
      public ActionForward execute(ActionMapping mapping, ActionForm form,

Index: ConsultaFaturamentoMedicoAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/controler/ConsultaFaturamentoMedicoAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ConsultaFaturamentoMedicoAction.java	28 Jul 2010 22:18:24 -0000	1.5
--- ConsultaFaturamentoMedicoAction.java	10 Nov 2010 11:15:57 -0000	1.6
***************
*** 27,35 ****
  import javax.servlet.http.HttpServletResponse;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionMapping;
  
  import oscar.billing.dao.AppointmentDAO;
--- 27,35 ----
  import javax.servlet.http.HttpServletResponse;
  
  import org.apache.log4j.Logger;
  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.billing.dao.AppointmentDAO;
***************
*** 40,44 ****
  
  public class ConsultaFaturamentoMedicoAction extends OscarAction {
!     private static Logger logger = LogManager.getLogger(ConsultaFaturamentoMedicoAction.class);
  
      public ActionForward execute(ActionMapping mapping, ActionForm form,
--- 40,44 ----
  
  public class ConsultaFaturamentoMedicoAction extends OscarAction {
!     private static Logger logger = MiscUtils.getLogger();
  
      public ActionForward execute(ActionMapping mapping, ActionForm form,

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/admin ProgramManagerAction.java, 1.66, 1.67 MigrateCaisiRolesAction.java, 1.6, 1.7

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/admin
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9458/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/admin

Modified Files:
	ProgramManagerAction.java MigrateCaisiRolesAction.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: MigrateCaisiRolesAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/admin/MigrateCaisiRolesAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MigrateCaisiRolesAction.java	6 Oct 2010 08:03:22 -0000	1.6
--- MigrateCaisiRolesAction.java	10 Nov 2010 11:15:57 -0000	1.7
***************
*** 34,38 ****
  public class MigrateCaisiRolesAction extends BaseAdminAction {
  
! 	private static final Logger logger = org.apache.log4j.LogManager.getLogger(MigrateCaisiRolesAction.class);
  
  	//private CaisiRoleManager caisiRoleMgr;
--- 34,38 ----
  public class MigrateCaisiRolesAction extends BaseAdminAction {
  
! 	private static final Logger logger = MiscUtils.getLogger();
  
  	//private CaisiRoleManager caisiRoleMgr;

Index: ProgramManagerAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/admin/ProgramManagerAction.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** ProgramManagerAction.java	9 Jul 2010 21:56:35 -0000	1.66
--- ProgramManagerAction.java	10 Nov 2010 11:15:57 -0000	1.67
***************
*** 77,81 ****
  public class ProgramManagerAction extends BaseAction {
  
! 	private static final Logger logger = org.apache.log4j.LogManager.getLogger(ProgramManagerAction.class);
  
  	private ClientRestrictionManager clientRestrictionManager;
--- 77,81 ----
  public class ProgramManagerAction extends BaseAction {
  
! 	private static final Logger logger = MiscUtils.getLogger();
  
  	private ClientRestrictionManager clientRestrictionManager;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util ContextStartupListener.java, 1.7, 1.8 VMStat.java, 1.3, 1.4

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9458/web/WEB-INF/classes/src/org/oscarehr/util

Modified Files:
	ContextStartupListener.java VMStat.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: ContextStartupListener.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util/ContextStartupListener.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ContextStartupListener.java	19 Sep 2010 04:17:30 -0000	1.7
--- ContextStartupListener.java	10 Nov 2010 11:15:57 -0000	1.8
***************
*** 1,5 ****
  package org.oscarehr.util;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorUpdateTask;
--- 1,4 ----
***************
*** 8,12 ****
  
  public class ContextStartupListener implements javax.servlet.ServletContextListener {
! 	private static final Logger logger = LogManager.getLogger(ContextStartupListener.class);
  	private static String contextPath=null;
  
--- 7,11 ----
  
  public class ContextStartupListener implements javax.servlet.ServletContextListener {
! 	private static final Logger logger = MiscUtils.getLogger();
  	private static String contextPath=null;
  

Index: VMStat.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/util/VMStat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VMStat.java	2 Jul 2009 20:37:37 -0000	1.3
--- VMStat.java	10 Nov 2010 11:15:57 -0000	1.4
***************
*** 32,36 ****
  import java.util.TimerTask;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  
--- 32,35 ----
***************
*** 39,43 ****
   */
  public class VMStat {
! 	private static final Logger logger = LogManager.getLogger(VMStat.class);
  
  	private static Timer timer = new Timer(VMStat.class.getName(), true);
--- 38,42 ----
   */
  public class VMStat {
! 	private static final Logger logger = MiscUtils.getLogger();
  
  	private static Timer timer = new Timer(VMStat.class.getName(), true);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/util StringUtils.java, 1.24, 1.25 AlertTimer.java, 1.12, 1.13 DateUtils.java, 1.19, 1.20

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/util
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9458/web/WEB-INF/classes/src/oscar/util

Modified Files:
	StringUtils.java AlertTimer.java DateUtils.java 
Log Message:
changed all the logManager calls to MiscUtils.getLogger()

Index: DateUtils.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/util/DateUtils.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** DateUtils.java	22 Jul 2010 18:08:24 -0000	1.19
--- DateUtils.java	10 Nov 2010 11:15:57 -0000	1.20
***************
*** 55,59 ****
  
  import org.apache.commons.lang.time.DateFormatUtils;
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.oscarehr.util.MiscUtils;
--- 55,58 ----
***************
*** 61,65 ****
  public final class DateUtils {
  
! 	private static Logger logger = LogManager.getLogger(DateUtils.class);
  
  	private static SimpleDateFormat sdf;
--- 60,64 ----
  public final class DateUtils {
  
! 	private static Logger logger = MiscUtils.getLogger();
  
  	private static SimpleDateFormat sdf;

Index: StringUtils.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/util/StringUtils.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** StringUtils.java	18 Oct 2010 16:07:57 -0000	1.24
--- StringUtils.java	10 Nov 2010 11:15:57 -0000	1.25
***************
*** 35,39 ****
  import java.util.regex.Pattern;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.apache.struts.upload.FormFile;
--- 35,38 ----
***************
*** 42,46 ****
  public class StringUtils {
  
!     private static Logger logger = LogManager.getLogger(StringUtils.class);
  
      /**
--- 41,45 ----
  public class StringUtils {
  
!     private static Logger logger = MiscUtils.getLogger();
  
      /**

Index: AlertTimer.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/util/AlertTimer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AlertTimer.java	23 Nov 2009 19:03:55 -0000	1.12
--- AlertTimer.java	10 Nov 2010 11:15:57 -0000	1.13
***************
*** 28,35 ****
  import java.util.TimerTask;
  
- import org.apache.log4j.LogManager;
  import org.apache.log4j.Logger;
  import org.oscarehr.util.DbConnectionFilter;
  import org.oscarehr.util.LoggedInInfo;
  import org.oscarehr.util.ShutdownException;
  
--- 28,35 ----
  import java.util.TimerTask;
  
  import org.apache.log4j.Logger;
  import org.oscarehr.util.DbConnectionFilter;
  import org.oscarehr.util.LoggedInInfo;
+ import org.oscarehr.util.MiscUtils;
  import org.oscarehr.util.ShutdownException;
  
***************
*** 45,49 ****
   */
  public class AlertTimer {
! 	private static Logger logger=LogManager.getLogger(AlertTimer.class);
  	
  	private static AlertTimer alerts = null;
--- 45,49 ----
   */
  public class AlertTimer {
! 	private static Logger logger=MiscUtils.getLogger();
  	
  	private static AlertTimer alerts = null;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formlatelifedisabilityvisualAid1.jsp, 1.6, 1.7 formlatelifedisabilityvisualAid2.jsp, 1.6, 1.7 formlatelifefunctionvisualAid2.jsp, 1.6, 1.7 formlatelifefunctionvisualAid1.jsp, 1.6, 1.7

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3443/web/form

Modified Files:
	formlatelifedisabilityvisualAid1.jsp 
	formlatelifedisabilityvisualAid2.jsp 
	formlatelifefunctionvisualAid2.jsp 
	formlatelifefunctionvisualAid1.jsp 
Log Message:
corrected case of JPG's 

Index: formlatelifefunctionvisualAid1.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formlatelifefunctionvisualAid1.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** formlatelifefunctionvisualAid1.jsp	15 May 2010 22:10:46 -0000	1.6
--- formlatelifefunctionvisualAid1.jsp	10 Nov 2010 10:56:58 -0000	1.7
***************
*** 80,96 ****
  							<tr bgcolor="white">
  								<td width="11%" align="center"><img
! 									src="graphics/functionVisualAid/None.JPG" align="center"
  									border='0' /></td>
  								<td width="20%" align="center"><img
! 									src="graphics/functionVisualAid/little.JPG" align="center"
  									border='0' /></td>
  								<td width="25%" align="center"><img
! 									src="graphics/functionVisualAid/some.JPG" align="center"
  									border='0' /></td>
  								<td width="30%" align="center"><img
! 									src="graphics/functionVisualAid/quiteALot.JPG" align="center"
  									border='0' /></td>
  								<td width="34%" align="center"><img
! 									src="graphics/functionVisualAid/cannotDo.JPG" align="center"
  									border='0' /></td>
  							</tr>
--- 80,96 ----
  							<tr bgcolor="white">
  								<td width="11%" align="center"><img
! 									src="graphics/functionVisualAid/None.jpg" align="center"
  									border='0' /></td>
  								<td width="20%" align="center"><img
! 									src="graphics/functionVisualAid/little.jpg" align="center"
  									border='0' /></td>
  								<td width="25%" align="center"><img
! 									src="graphics/functionVisualAid/some.jpg" align="center"
  									border='0' /></td>
  								<td width="30%" align="center"><img
! 									src="graphics/functionVisualAid/quiteALot.jpg" align="center"
  									border='0' /></td>
  								<td width="34%" align="center"><img
! 									src="graphics/functionVisualAid/cannotDo.jpg" align="center"
  									border='0' /></td>
  							</tr>

Index: formlatelifedisabilityvisualAid1.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formlatelifedisabilityvisualAid1.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** formlatelifedisabilityvisualAid1.jsp	15 May 2010 22:10:46 -0000	1.6
--- formlatelifedisabilityvisualAid1.jsp	10 Nov 2010 10:56:58 -0000	1.7
***************
*** 77,93 ****
  							<tr bgcolor="white" height="150px">
  								<td width="34%" align="center"><img
! 									src="graphics/disabilityVisualAid/veryOften.JPG" align="center"
  									border='0' /></td>
  								<td width="30%" align="center"><img
! 									src="graphics/disabilityVisualAid/often.JPG" align="center"
  									border='0' /></td>
  								<td width="25%" align="center"><img
! 									src="graphics/disabilityVisualAid/onceInAWhile.JPG"
  									align="center" border='0' /></td>
  								<td width="20%" align="center"><img
! 									src="graphics/disabilityVisualAid/almostNever.JPG"
  									align="center" border='0' /></td>
  								<td width="11%" align="center"><img
! 									src="graphics/disabilityVisualAid/never.JPG" align="center"
  									border='0' /></td>
  							</tr>
--- 77,93 ----
  							<tr bgcolor="white" height="150px">
  								<td width="34%" align="center"><img
! 									src="graphics/disabilityVisualAid/veryOften.jpg" align="center"
  									border='0' /></td>
  								<td width="30%" align="center"><img
! 									src="graphics/disabilityVisualAid/often.jpg" align="center"
  									border='0' /></td>
  								<td width="25%" align="center"><img
! 									src="graphics/disabilityVisualAid/onceInAWhile.jpg"
  									align="center" border='0' /></td>
  								<td width="20%" align="center"><img
! 									src="graphics/disabilityVisualAid/almostNever.jpg"
  									align="center" border='0' /></td>
  								<td width="11%" align="center"><img
! 									src="graphics/disabilityVisualAid/never.jpg" align="center"
  									border='0' /></td>
  							</tr>

Index: formlatelifefunctionvisualAid2.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formlatelifefunctionvisualAid2.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** formlatelifefunctionvisualAid2.jsp	15 May 2010 22:10:46 -0000	1.6
--- formlatelifefunctionvisualAid2.jsp	10 Nov 2010 10:56:58 -0000	1.7
***************
*** 81,97 ****
  							<tr bgcolor="white">
  								<td width="11%" align="center"><img
! 									src="graphics/functionVisualAid/None.JPG" align="center"
  									border='0' /></td>
  								<td width="20%" align="center"><img
! 									src="graphics/functionVisualAid/little.JPG" align="center"
  									border='0' /></td>
  								<td width="25%" align="center"><img
! 									src="graphics/functionVisualAid/some.JPG" align="center"
  									border='0' /></td>
  								<td width="30%" align="center"><img
! 									src="graphics/functionVisualAid/quiteALot.JPG" align="center"
  									border='0' /></td>
  								<td width="34%" align="center"><img
! 									src="graphics/functionVisualAid/cannotDo.JPG" align="center"
  									border='0' /></td>
  							</tr>
--- 81,97 ----
  							<tr bgcolor="white">
  								<td width="11%" align="center"><img
! 									src="graphics/functionVisualAid/None.jpg" align="center"
  									border='0' /></td>
  								<td width="20%" align="center"><img
! 									src="graphics/functionVisualAid/little.jpg" align="center"
  									border='0' /></td>
  								<td width="25%" align="center"><img
! 									src="graphics/functionVisualAid/some.jpg" align="center"
  									border='0' /></td>
  								<td width="30%" align="center"><img
! 									src="graphics/functionVisualAid/quiteALot.jpg" align="center"
  									border='0' /></td>
  								<td width="34%" align="center"><img
! 									src="graphics/functionVisualAid/cannotDo.jpg" align="center"
  									border='0' /></td>
  							</tr>

Index: formlatelifedisabilityvisualAid2.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formlatelifedisabilityvisualAid2.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** formlatelifedisabilityvisualAid2.jsp	15 May 2010 22:10:46 -0000	1.6
--- formlatelifedisabilityvisualAid2.jsp	10 Nov 2010 10:56:58 -0000	1.7
***************
*** 78,94 ****
  							<tr bgcolor="white" height="150px">
  								<td width="11%" align="center" align="center"><img
! 									src="graphics/disabilityVisualAid/notAtAll.JPG" align="center"
  									border='0' /></td>
  								<td width="20%" align="center"><img
! 									src="graphics/disabilityVisualAid/little.JPG" align="center"
  									border='0' /></td>
  								<td width="25%" align="center"><img
! 									src="graphics/disabilityVisualAid/somewhat.JPG" align="center"
  									border='0' /></td>
  								<td width="30%" align="center"><img
! 									src="graphics/disabilityVisualAid/aLot.JPG" align="center"
  									border='0' /></td>
  								<td width="34%" align="center"><img
! 									src="graphics/disabilityVisualAid/completely.JPG"
  									align="center" border='0' /></td>
  							</tr>
--- 78,94 ----
  							<tr bgcolor="white" height="150px">
  								<td width="11%" align="center" align="center"><img
! 									src="graphics/disabilityVisualAid/notAtAll.jpg" align="center"
  									border='0' /></td>
  								<td width="20%" align="center"><img
! 									src="graphics/disabilityVisualAid/little.jpg" align="center"
  									border='0' /></td>
  								<td width="25%" align="center"><img
! 									src="graphics/disabilityVisualAid/somewhat.jpg" align="center"
  									border='0' /></td>
  								<td width="30%" align="center"><img
! 									src="graphics/disabilityVisualAid/aLot.jpg" align="center"
  									border='0' /></td>
  								<td width="34%" align="center"><img
! 									src="graphics/disabilityVisualAid/completely.jpg"
  									align="center" border='0' /></td>
  							</tr>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form/graphics/functionVisualAid cannotdo.jpg, NONE, 1.1 quitealot.jpg, NONE, 1.1 none.jpg, NONE, 1.1 some.jpg, NONE, 1.1 little.jpg, NONE, 1.1 some.JPG, 1.1, NONE quiteALot.JPG, 1.1, NONE None.JPG, 1.1, NONE cannotDo.JPG, 1.1, NONE little.JPG, 1.1, NONE

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/graphics/functionVisualAid
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3443/web/form/graphics/functionVisualAid

Added Files:
	cannotdo.jpg quitealot.jpg none.jpg some.jpg little.jpg 
Removed Files:
	some.JPG quiteALot.JPG None.JPG cannotDo.JPG little.JPG 
Log Message:
corrected case of JPG's 

--- NEW FILE: none.jpg ---
(This appears to be a binary file; contents omitted.)

--- None.JPG DELETED ---

--- NEW FILE: some.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cannotdo.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: little.jpg ---
(This appears to be a binary file; contents omitted.)

--- little.JPG DELETED ---

--- some.JPG DELETED ---

--- cannotDo.JPG DELETED ---

--- NEW FILE: quitealot.jpg ---
(This appears to be a binary file; contents omitted.)

--- quiteALot.JPG DELETED ---

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form/graphics/disabilityVisualAid never.jpg, NONE, 1.1 somewhat.jpg, NONE, 1.1 little.jpg, NONE, 1.1 completely.jpg, NONE, 1.1 notatall.jpg, NONE, 1.1 onceinawhile.jpg, NONE, 1.1 veryoften.jpg, NONE, 1.1 almostnever.jpg, NONE, 1.1 alot.jpg, NONE, 1.1 often.jpg, NONE, 1.1 onceInAWhile.JPG, 1.1, NONE veryOften.JPG, 1.1, NONE little.JPG, 1.1, NONE often.JPG, 1.1, NONE somewhat.JPG, 1.1, NONE completely.JPG, 1.1, NONE almostNever.JPG, 1.1, NONE never.JPG, 1.1, NONE aLot.JPG, 1.1, NONE notAtAll.JPG, 1.1, NONE

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/graphics/disabilityVisualAid
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3443/web/form/graphics/disabilityVisualAid

Added Files:
	never.jpg somewhat.jpg little.jpg completely.jpg notatall.jpg 
	onceinawhile.jpg veryoften.jpg almostnever.jpg alot.jpg 
	often.jpg 
Removed Files:
	onceInAWhile.JPG veryOften.JPG little.JPG often.JPG 
	somewhat.JPG completely.JPG almostNever.JPG never.JPG aLot.JPG 
	notAtAll.JPG 
Log Message:
corrected case of JPG's 

--- NEW FILE: completely.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: notatall.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: almostnever.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: little.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: never.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: onceinawhile.jpg ---
(This appears to be a binary file; contents omitted.)

--- notAtAll.JPG DELETED ---

--- NEW FILE: alot.jpg ---
(This appears to be a binary file; contents omitted.)

--- often.JPG DELETED ---

--- NEW FILE: somewhat.jpg ---
(This appears to be a binary file; contents omitted.)

--- completely.JPG DELETED ---

--- never.JPG DELETED ---

--- little.JPG DELETED ---

--- NEW FILE: veryoften.jpg ---
(This appears to be a binary file; contents omitted.)

--- onceInAWhile.JPG DELETED ---

--- almostNever.JPG DELETED ---

--- NEW FILE: often.jpg ---
(This appears to be a binary file; contents omitted.)

--- somewhat.JPG DELETED ---

--- veryOften.JPG DELETED ---

--- aLot.JPG DELETED ---

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarMessenger DisplayMessages.jsp, 1.23, 1.24 DisplayDemographicMessages.jsp, 1.7, 1.8

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3443/web/oscarMessenger

Modified Files:
	DisplayMessages.jsp DisplayDemographicMessages.jsp 
Log Message:
corrected case of JPG's 

Index: DisplayMessages.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/DisplayMessages.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** DisplayMessages.jsp	7 Jul 2010 21:01:30 -0000	1.23
--- DisplayMessages.jsp	10 Nov 2010 10:56:58 -0000	1.24
***************
*** 423,427 ****
                                         String pdfAtta = dm.pdfAttach; 
                                         if (atta.equals("1") || pdfAtta.equals("1") ){ %>
!                                             <img src="img/clip4.JPG">
                                      <% } %>
  
--- 423,427 ----
                                         String pdfAtta = dm.pdfAttach; 
                                         if (atta.equals("1") || pdfAtta.equals("1") ){ %>
!                                             <img src="img/clip4.jpg">
                                      <% } %>
  

Index: DisplayDemographicMessages.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/DisplayDemographicMessages.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DisplayDemographicMessages.jsp	15 May 2010 22:10:47 -0000	1.7
--- DisplayDemographicMessages.jsp	10 Nov 2010 10:56:58 -0000	1.8
***************
*** 229,233 ****
  								property="messageNo" value="<%=dm.messageId %>" /> <% String atta = dm.attach;
                                              if (atta.equals("1")){
!                                             %><img src="img/clip4.JPG">
  							<%
                                              }
--- 229,233 ----
  								property="messageNo" value="<%=dm.messageId %>" /> <% String atta = dm.attach;
                                              if (atta.equals("1")){
!                                             %><img src="img/clip4.jpg">
  							<%
                                              }