[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF applicationContextCaisi.xml, 1.63, 1.64 applic
open source web-based Electronic Medical Record (EMR) system
Brought to you by:
davidhcchan,
jaygallagher
From: Ted L. <ted...@us...> - 2008-04-21 21:11:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11371/web/WEB-INF Modified Files: applicationContextCaisi.xml applicationContext.xml Log Message: caisi integrator work Index: applicationContextCaisi.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/applicationContextCaisi.xml,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** applicationContextCaisi.xml 1 Apr 2008 21:37:12 -0000 1.63 --- applicationContextCaisi.xml 21 Apr 2008 21:01:08 -0000 1.64 *************** *** 23,27 **** </bean> - <!-- audit strategy --> <bean id="bedAuditStrategy" class="org.oscarehr.PMmodule.dao.BedAuditStrategy" autowire="byName"/> --- 23,26 ---- *************** *** 200,205 **** <property name="delay" value="30000"/> <property name="period" value="43200000"/> ! <!-- ! <property name="period" value="60000"/> --> </bean> --- 199,204 ---- <property name="delay" value="30000"/> <property name="period" value="43200000"/> ! <!-- ! <property name="period" value="10000"/> --> </bean> Index: applicationContext.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/applicationContext.xml,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** applicationContext.xml 21 Apr 2008 17:11:09 -0000 1.101 --- applicationContext.xml 21 Apr 2008 21:01:08 -0000 1.102 *************** *** 6,19 **** http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd" default-autowire="no"> ! ! <!-- setup JPA --> ! <import resource="classpath:spring_jpa.xml"/> ! ! <!-- setup hibernate --> ! <import resource="classpath:spring_hibernate.xml"/> ! <!-- JPA DAO --> <bean id="issueGroupDao" class="org.oscarehr.common.dao.IssueGroupDao" autowire="byName"/> ! <!-- hibernated DAO --> <bean id="redirectLinkDao" class="org.caisi.dao.RedirectLinkDao" autowire="byName"/> --- 6,19 ---- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd" default-autowire="no"> ! ! <!-- setup JPA --> ! <import resource="classpath:spring_jpa.xml"/> ! ! <!-- setup hibernate --> ! <import resource="classpath:spring_hibernate.xml"/> ! <!-- JPA DAO --> <bean id="issueGroupDao" class="org.oscarehr.common.dao.IssueGroupDao" autowire="byName"/> ! <!-- hibernated DAO --> <bean id="redirectLinkDao" class="org.caisi.dao.RedirectLinkDao" autowire="byName"/> *************** *** 30,34 **** <bean id="bedDAO" class="org.oscarehr.PMmodule.dao.BedDAO" autowire="byName"/> <bean id="clientDao" class="org.oscarehr.PMmodule.dao.ClientDao" autowire="byName" /> ! <!-- <bean id="topazDao" class="com.quatro.dao.TopazDao" autowire="byName" /> --> --- 30,34 ---- <bean id="bedDAO" class="org.oscarehr.PMmodule.dao.BedDAO" autowire="byName"/> <bean id="clientDao" class="org.oscarehr.PMmodule.dao.ClientDao" autowire="byName" /> ! <!-- <bean id="topazDao" class="com.quatro.dao.TopazDao" autowire="byName" /> --> *************** *** 73,80 **** <bean id="UserPropertyDAO" class="org.oscarehr.common.dao.UserPropertyDAO" autowire="byName" /> <bean id="UserDSMessagePrefsDAO" class="org.oscarehr.common.dao.UserDSMessagePrefsDAO" autowire="byName" /> ! <bean id="facilityDAO" class="org.oscarehr.PMmodule.dao.FacilityDAO" autowire="byName"/> ! <bean id="facilityMessageDAO" class="org.caisi.dao.FacilityMessageDAO" autowire="byName"/> ! <bean id="caisiEditorDAO" class="org.caisi.dao.CaisiEditorDAO" autowire="byName" /> ! <!-- configure the scratch pad --> <bean id="scratchPadDao" class="com.quatro.dao.ScratchPadDao" autowire="byName" /> <bean id="lookupDao" class="com.quatro.dao.LookupDao" autowire="byName" /> --- 73,80 ---- <bean id="UserPropertyDAO" class="org.oscarehr.common.dao.UserPropertyDAO" autowire="byName" /> <bean id="UserDSMessagePrefsDAO" class="org.oscarehr.common.dao.UserDSMessagePrefsDAO" autowire="byName" /> ! <bean id="facilityDAO" class="org.oscarehr.PMmodule.dao.FacilityDAO" autowire="byName"/> ! <bean id="facilityMessageDAO" class="org.caisi.dao.FacilityMessageDAO" autowire="byName"/> ! <bean id="caisiEditorDAO" class="org.caisi.dao.CaisiEditorDAO" autowire="byName" /> ! <!-- configure the scratch pad --> <bean id="scratchPadDao" class="com.quatro.dao.ScratchPadDao" autowire="byName" /> <bean id="lookupDao" class="com.quatro.dao.LookupDao" autowire="byName" /> *************** *** 86,90 **** </bean> <bean id="scratchPadManagerTarget" class="com.quatro.service.ScratchPadManager"> ! <property name="scratchPadDao" ref="scratchPadDao"/> </bean> <bean id="lookupManager" class="com.quatro.service.LookupManager" autowire="byName"> --- 86,90 ---- </bean> <bean id="scratchPadManagerTarget" class="com.quatro.service.ScratchPadManager"> ! <property name="scratchPadDao" ref="scratchPadDao"/> </bean> <bean id="lookupManager" class="com.quatro.service.LookupManager" autowire="byName"> *************** *** 94,98 **** <property name="userAccessDao" ref="userAccessDao"/> </bean> ! <!-- configure the available measurement flow sheets --> <bean id="measurementTemplateFlowSheet" class="oscar.oscarEncounter.oscarMeasurements.MeasurementTemplateFlowSheetConfig"> --- 94,98 ---- <property name="userAccessDao" ref="userAccessDao"/> </bean> ! <!-- configure the available measurement flow sheets --> <bean id="measurementTemplateFlowSheet" class="oscar.oscarEncounter.oscarMeasurements.MeasurementTemplateFlowSheetConfig"> *************** *** 105,109 **** </property> </bean> ! <!-- managers --> <bean id="caisiEditorManager" parent="baseTransactionProxy" lazy-init="default" --- 105,109 ---- </property> </bean> ! <!-- managers --> <bean id="caisiEditorManager" parent="baseTransactionProxy" lazy-init="default" *************** *** 145,151 **** <property name="systemMessageDAO" ref="systemMessageDAO"/> </bean> ! ! <bean id="facilityMessageManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" ! lazy-init="default" dependency-check="default"> <property name="transactionManager" ref="transactionManager"/> <property name="target" ref="facilityMessageManagerTarget"/> --- 145,151 ---- <property name="systemMessageDAO" ref="systemMessageDAO"/> </bean> ! ! <bean id="facilityMessageManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" ! lazy-init="default" dependency-check="default"> <property name="transactionManager" ref="transactionManager"/> <property name="target" ref="facilityMessageManagerTarget"/> *************** *** 162,166 **** <property name="facilityMessageDAO" ref="facilityMessageDAO"/> </bean> ! <!-- Manager classes --> <bean id="programQueueManager" parent="baseTransactionProxy"> --- 162,166 ---- <property name="facilityMessageDAO" ref="facilityMessageDAO"/> </bean> ! <!-- Manager classes --> <bean id="programQueueManager" parent="baseTransactionProxy"> *************** *** 257,261 **** </bean> <bean id="ticklerManagerTarget" class="org.oscarehr.casemgmt.service.TicklerManager" autowire="byName" > ! </bean> <bean id="ClientImageManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"> --- 257,261 ---- </bean> <bean id="ticklerManagerTarget" class="org.oscarehr.casemgmt.service.TicklerManager" autowire="byName" > ! </bean> <bean id="ClientImageManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"> *************** *** 295,303 **** <property name="clientRestrictionManager" ref="clientRestrictionManager"/> <property name="outsideOfDomainEnabled" value="${pmm.client.search.outside.of.domain.enabled}"/> ! </bean> </property> </bean> ! <!-- <bean id="topazManager" parent="baseTransactionProxy"> <property name="target"> --- 295,303 ---- <property name="clientRestrictionManager" ref="clientRestrictionManager"/> <property name="outsideOfDomainEnabled" value="${pmm.client.search.outside.of.domain.enabled}"/> ! </bean> </property> </bean> ! <!-- <bean id="topazManager" parent="baseTransactionProxy"> <property name="target"> *************** *** 308,312 **** </bean> --> ! <bean id="integratorManager" class="org.oscarehr.PMmodule.service.IntegratorManager" autowire="byName" /> <bean id="infirmBedProgramManager" parent="baseTransactionProxy"> <property name="target"> --- 308,312 ---- </bean> --> ! <bean id="caisiIntegratorManager" class="org.oscarehr.PMmodule.service.CaisiIntegratorManager" autowire="byName" /> <bean id="infirmBedProgramManager" parent="baseTransactionProxy"> <property name="target"> *************** *** 317,321 **** </property> </bean> ! <!-- TicklerPlus managers --> <bean id="ticklerManagerT" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"> --- 317,321 ---- </property> </bean> ! <!-- TicklerPlus managers --> <bean id="ticklerManagerT" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"> *************** *** 337,341 **** <property name="roleProgramAccessDAO" ref="RoleProgramAccessDAO"/> </bean> ! <bean id="demographicManagerT" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"> <property name="transactionManager" ref="transactionManager"/> --- 337,341 ---- <property name="roleProgramAccessDAO" ref="RoleProgramAccessDAO"/> </bean> ! <bean id="demographicManagerT" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"> <property name="transactionManager" ref="transactionManager"/> *************** *** 364,368 **** </property> </bean> ! <bean id="consultationManagerTarget" class="org.caisi.service.ConsultationManager"> <property name="consultationDAO" ref="consultationDAOT"/> --- 364,368 ---- </property> </bean> ! <bean id="consultationManagerTarget" class="org.caisi.service.ConsultationManager"> <property name="consultationDAO" ref="consultationDAOT"/> |