OpenMRS

Timestamp:

04/22/08 20:08:04 (9 months ago)

Author:

bwolfe

Message:

Merging trunk to report-api-refactoring [3896]:[3997]

Files:

• openmrs/branches/report_api_refactoring/metadata/api/hibernate/hibernate.cfg.xml (modified) (view diffs)
• openmrs/branches/report_api_refactoring/metadata/api/hibernate/org/openmrs/api/db/hibernate/Obs.hbm.xml (modified) (view diffs)
• openmrs/branches/report_api_refactoring/metadata/api/hibernate/org/openmrs/api/db/hibernate/Patient.hbm.xml (modified) (view diffs)
• openmrs/branches/report_api_refactoring/metadata/api/hibernate/org/openmrs/scheduler/db/hibernate/TaskConfig.hbm.xml (deleted)
• openmrs/branches/report_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/report_api_refactoring/metadata/api/log4j/log4j.xml (modified) (view diffs)
• openmrs/branches/report_api_refactoring/metadata/api/spring/applicationContext-service.xml (modified) (view diffs)
• openmrs/branches/report_api_refactoring/metadata/model/openmrs_1.2.0-mysql.sql (modified) (view diffs)
• openmrs/branches/report_api_refactoring/metadata/model/openmrs_1.2.0-to-latest-mysqldiff.sql (modified) (view diffs)
• openmrs/branches/report_api_refactoring/properties.xml (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/Encounter.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/hl7/handler/ORUR01Handler.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/module/ModuleClassLoader.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/Schedulable.java (deleted)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/SchedulableFactory.java (deleted)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/SchedulerConstants.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/SchedulerService.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/SchedulerUtil.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/StatefulTask.java (modified) (view diffs)
• openmrs/branches/report_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/report_api_refactoring/src/api/org/openmrs/scheduler/TaskConfig.java (deleted)
• openmrs/branches/report_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/report_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/report_api_refactoring/src/api/org/openmrs/scheduler/db/SchedulerDAO.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/db/hibernate/HibernateSchedulerDAO.java (modified) (view diffs)
• openmrs/branches/report_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/report_api_refactoring/src/api/org/openmrs/scheduler/tasks/AlertReminderTask.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/tasks/CheckInternetConnectivityTask.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/tasks/GenerateDataExportTask.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/tasks/HelloWorldTask.java (modified) (view diffs)
• openmrs/branches/report_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/report_api_refactoring/src/api/org/openmrs/scheduler/tasks/ProcessHL7InQueueTask.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/tasks/SendEmailTask.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/timer/TimerSchedulerMemento.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/scheduler/timer/TimerSchedulerService.java (deleted)
• openmrs/branches/report_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/report_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/report_api_refactoring/src/api/org/openmrs/scheduler/timer/TimerTaskWrapper.java (deleted)
• openmrs/branches/report_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/report_api_refactoring/src/api/org/openmrs/util/OpenmrsClassLoader.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/util/OpenmrsConstants.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/api/org/openmrs/util/OpenmrsUtil.java (modified) (view diffs)
• openmrs/branches/report_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/report_api_refactoring/src/web/org/openmrs/scheduler/web/controller/SchedulerFormController.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/web/org/openmrs/scheduler/web/controller/SchedulerListController.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/web/org/openmrs/web/Listener.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/src/web/org/openmrs/web/controller/maintenance/GlobalPropertyController.java (modified) (view diffs)
• openmrs/branches/report_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/report_api_refactoring/test/api/org/openmrs/test/api/ObsServiceTest.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/test/api/org/openmrs/test/hl7/ORUR01HandlerTest.java (modified) (view diffs)
• openmrs/branches/report_api_refactoring/test/api/org/openmrs/test/scheduler (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/scheduler) (view diffs)
• openmrs/branches/report_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/report_api_refactoring/web/WEB-INF/messages.properties (modified) (view diffs)
• openmrs/branches/report_api_refactoring/web/WEB-INF/openmrs-servlet.xml (modified) (view diffs)
• openmrs/branches/report_api_refactoring/web/WEB-INF/template/gutter.jsp (modified) (view diffs)
• openmrs/branches/report_api_refactoring/web/WEB-INF/view/admin/maintenance/localHeader.jsp (modified) (view diffs)
• openmrs/branches/report_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/report_api_refactoring/web/WEB-INF/view/admin/scheduler/schedulerForm.jsp (modified) (view diffs)
• openmrs/branches/report_api_refactoring/web/WEB-INF/view/portlets/patientOverview.jsp (modified) (view diffs)
• openmrs/branches/report_api_refactoring/web/WEB-INF/view/portlets/patientPrograms.jsp (modified) (view diffs)