OpenMRS

Timestamp:

04/29/08 15:02:30 (8 months ago)

Author:

bwolfe

Message:

Merging trunk to api-refactoring [3685]:[4052]

Files:

• openmrs/branches/api_refactoring/.classpath (modified) (view diffs)
• openmrs/branches/api_refactoring/metadata/api/hibernate/hibernate.cfg.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/metadata/api/hibernate/org/openmrs/api/db/hibernate/Encounter.hbm.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/metadata/api/hibernate/org/openmrs/api/db/hibernate/Obs.hbm.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/metadata/api/hibernate/org/openmrs/api/db/hibernate/Patient.hbm.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/metadata/api/hibernate/org/openmrs/scheduler/db/hibernate/TaskConfig.hbm.xml (deleted)
• openmrs/branches/api_refactoring/metadata/api/hibernate/org/openmrs/scheduler/db/hibernate/TaskDefinition.hbm.xml (copied) (copied from openmrs/trunk/metadata/api/hibernate/org/openmrs/scheduler/db/hibernate/TaskDefinition.hbm.xml) (view diffs)
• openmrs/branches/api_refactoring/metadata/api/log4j/log4j.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/metadata/api/spring/applicationContext-service.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/metadata/model/openmrs_1.2.0-mysql.sql (modified) (view diffs)
• openmrs/branches/api_refactoring/metadata/model/openmrs_1.2.0-to-latest-mysqldiff.sql (modified) (view diffs)
• openmrs/branches/api_refactoring/properties.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/Encounter.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/FormField.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/Obs.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/FormService.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/ObsService.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/db/FormDAO.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/db/ObsDAO.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/db/hibernate/HibernateFormDAO.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/db/hibernate/HibernateObsDAO.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/db/hibernate/HibernatePersonDAO.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/impl/EncounterServiceImpl.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/impl/FormServiceImpl.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/impl/ObsServiceImpl.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/hl7/HL7Constants.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/hl7/HL7Service.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/hl7/handler/ORUR01Handler.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/module/ModuleClassLoader.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/module/ModuleFactory.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/reporting/export/DataExportFunctions.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/Schedulable.java (deleted)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/SchedulableFactory.java (deleted)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/SchedulerConstants.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/SchedulerService.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/SchedulerUtil.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/StatefulTask.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/Task.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/scheduler/Task.java) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/TaskConfig.java (deleted)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/TaskDefinition.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/scheduler/TaskDefinition.java) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/TaskFactory.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/scheduler/TaskFactory.java) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/db/SchedulerDAO.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/db/hibernate/HibernateSchedulerDAO.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/tasks/AbstractTask.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/scheduler/tasks/AbstractTask.java) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/tasks/AlertReminderTask.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/tasks/CheckInternetConnectivityTask.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/tasks/GenerateDataExportTask.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/tasks/HelloWorldTask.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/tasks/OpenmrsTestTask.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/scheduler/tasks/OpenmrsTestTask.java) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/tasks/ProcessHL7InQueueTask.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/tasks/SendEmailTask.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/timer/TimerSchedulerMemento.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/timer/TimerSchedulerService.java (deleted)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/timer/TimerSchedulerServiceImpl.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/scheduler/timer/TimerSchedulerServiceImpl.java) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/timer/TimerSchedulerTask.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/scheduler/timer/TimerSchedulerTask.java) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/scheduler/timer/TimerTaskWrapper.java (deleted)
• openmrs/branches/api_refactoring/src/api/org/openmrs/util/MemoryAppender.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/util/MemoryAppender.java) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/util/OpenmrsClassLoader.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/util/OpenmrsConstants.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/util/OpenmrsUtil.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/validator (copied) (copied from openmrs/trunk/src/api/org/openmrs/validator) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/validator/ObsValidator.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/validator/ObsValidator.java) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/module/web/extension/BoxExt.java (copied) (copied from openmrs/trunk/src/web/org/openmrs/module/web/extension/BoxExt.java) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/scheduler/web/controller/SchedulerFormController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/scheduler/web/controller/SchedulerListController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/Listener.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/ConceptFormController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/encounter/EncounterDisplayController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/encounter/EncounterFormController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/maintenance/GlobalPropertyController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/maintenance/ServerLogController.java (copied) (copied from openmrs/trunk/src/web/org/openmrs/web/controller/maintenance/ServerLogController.java) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/observation/ObsFormController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/CreateInitialDataSet.java (modified) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/EncounterTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/EncounterTest.java) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/ObsTest.java (modified) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/PatientTest.java (modified) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/PersonTest.java (modified) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/api/EncounterServiceTest.java (modified) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/api/FormServiceTest.java (modified) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/api/ObsServiceTest.java (modified) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/api/PersonServiceTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/PersonServiceTest.java) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/api/include/FormServiceTest-formFields.xml (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/include/FormServiceTest-formFields.xml) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/api/include/ObsServiceTest-initial.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/api/include/PersonServiceTest-createRelationship.xml (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/include/PersonServiceTest-createRelationship.xml) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/api/include/formfield.xml (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/include/formfield.xml) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/hl7 (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/hl7) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/hl7/ORUR01HandlerTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/hl7/ORUR01HandlerTest.java) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/hl7/include (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/hl7/include) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/hl7/include/ORUTest-initialData.xml (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/hl7/include/ORUTest-initialData.xml) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/reporting/export/DataExportTest.java (modified) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/reporting/export/include/DataExportTest-obs.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/scheduler (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/scheduler) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/scheduler/SchedulerServiceTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/scheduler/SchedulerServiceTest.java) (view diffs)
• openmrs/branches/api_refactoring/test/web/org (copied) (copied from openmrs/trunk/test/web/org) (view diffs)
• openmrs/branches/api_refactoring/test/web/org/openmrs (copied) (copied from openmrs/trunk/test/web/org/openmrs) (view diffs)
• openmrs/branches/api_refactoring/test/web/org/openmrs/web (copied) (copied from openmrs/trunk/test/web/org/openmrs/web) (view diffs)
• openmrs/branches/api_refactoring/test/web/org/openmrs/web/test (copied) (copied from openmrs/trunk/test/web/org/openmrs/web/test) (view diffs)
• openmrs/branches/api_refactoring/test/web/org/openmrs/web/test/EncounterDisplayControllerTest.java (copied) (copied from openmrs/trunk/test/web/org/openmrs/web/test/EncounterDisplayControllerTest.java) (view diffs)
• openmrs/branches/api_refactoring/test/web/org/openmrs/web/test/include (copied) (copied from openmrs/trunk/test/web/org/openmrs/web/test/include) (view diffs)
• openmrs/branches/api_refactoring/test/web/org/openmrs/web/test/include/EncounterDisplayControllerTest.xml (copied) (copied from openmrs/trunk/test/web/org/openmrs/web/test/include/EncounterDisplayControllerTest.xml) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/messages.properties (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/openmrs-servlet.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/taglibs/openmrs.tld (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/template/gutter.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/template/header.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/template/headerFull.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/encounters/encounterForm.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/encounters/obsDisplay.jsp (copied) (copied from openmrs/trunk/web/WEB-INF/view/admin/encounters/obsDisplay.jsp) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/maintenance/localHeader.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/maintenance/serverLog.jsp (copied) (copied from openmrs/trunk/web/WEB-INF/view/admin/maintenance/serverLog.jsp) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/patients/newPatientForm.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/person/include/editPersonInfo.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/scheduler/schedulerForm.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/encounters/encounterDisplay.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/portlets/patientEncounters.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/portlets/patientOverview.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/portlets/patientPrograms.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/errorhandler.jsp (copied) (copied from openmrs/trunk/web/errorhandler.jsp) (view diffs)
• openmrs/branches/api_refactoring/web/openmrs.css (modified) (view diffs)