OpenMRS

Timestamp:

08/06/08 17:17:55 (3 months ago)

Author:

mseaton

Message:

synchronization_bidirectional_branch: merge from [4734] to [5181].

Files:

• openmrs/branches/data_synchronization_bidirectional/.classpath (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/.project (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/build.properties (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/build.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/lib/junit/junit-3.8.1.jar (deleted)
• openmrs/branches/data_synchronization_bidirectional/lib/junit/junit-4.4.jar (copied) (copied from openmrs/trunk/lib/junit/junit-4.4.jar) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/api/hibernate/org/openmrs/api/db/hibernate/Order.hbm.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/api/log4j/log4j.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/model/1.3.0-createdb-from-scratch-with-demo-data.sql (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/model/1.3.0-schema-only.sql (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/model/1.3.0-schema-with-core-and-demo-data.sql (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/model/1.3.0-schema-with-core-data.sql (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/model/update-to-latest-db.mysqldiff.sql (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/model/util/update-scripts-to-latest.sh (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/properties.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/Order.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/Patient.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/Person.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/EncounterService.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/PatientService.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/PersonService.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/context/UserContext.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/EncounterDAO.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/PatientDAO.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/PersonDAO.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/HibernateContextDAO.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/HibernatePatientDAO.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/HibernatePersonDAO.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/AdministrationServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/ConceptServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/EncounterServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/ObsServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/OrderServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/PatientServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/PersonServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/ProgramWorkflowServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/UserServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/module/Module.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/module/ModuleFactory.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/notification/Alert.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/notification/AlertService.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/reporting/export/DataExportFunctions.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/scheduler/SchedulerUtil.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/util/OpenmrsClassLoader.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/util/OpenmrsConstants.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/util/OpenmrsUtil.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/module/web/WebModuleUtil.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/notification/web/controller/AlertFormController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/notification/web/dwr/DWRAlertService.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/Listener.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/OpenmrsFilter.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/OptionsFormController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/PortletController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/RegimenPortletController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/concept/ConceptProposalFormController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/encounter/EncounterFormController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/patient/NewPatientFormController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/dwr/DWRRelationshipService.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/dwr/DrugOrderListItem.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/dwr/RelationshipListItem.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/servlet/LogoutServlet.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/BaseContextSensitiveTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/CreateInitialDataSet.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/EncounterTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/ObsTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/OpenmrsTestsTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/OpenmrsTestsTest.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/OrderTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/PatientTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/PersonNameTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/PersonTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/RoleTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/AdministrationServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/CohortServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/ConceptServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/EncounterServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/FormServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/LocationServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/ObsServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/OrderServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/PatientServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/PatientSetServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/PersonServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/ProgramWorkflowServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/UserServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/arden/ArdenServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/context/ContextTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/db/hibernate/HibernateAlertDAOTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/notification/MessageServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/notification/MessageTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/cohort/CohortUtilTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/hl7/ORUR01HandlerTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/logic/LogicBasicTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/logic/LogicCriteriaTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/logic/LogicEvalTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/logic/LogicServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/logic/ObsDataSourceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/module/ModuleInteroperabilityTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/notification/AlertServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/notification/db/hibernate/HibernateAlertDAOTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/patient/LuhnIdentifierValidatorTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/patient/VerhoeffIdentifierValidatorTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/DataSetServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/EvaluationContextTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/PatientSearchParameterTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/PatientSearchParameterTest.xml (deleted)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/PatientSearchTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/PepfarReportFromXml.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/PepfarReportSerializationTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/PepfarReportTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/ReportSchemaXmlTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/ReportSchemaXmlTestNonContext.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/RowPerObsDatasetTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/RowPerProgramEnrollmentDatasetTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/include/PatientSearchParameterTest.xml (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/report/include/PatientSearchParameterTest.xml) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/report/include/ReportTests-patients.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/reporting/CachingPatientFilterTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/reporting/PatientFilterTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/reporting/export/DataExportTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/scheduler/SchedulerServiceTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/util/OpenmrsUtilTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/web/org/openmrs/web/test/EncounterDisplayControllerTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/web/org/openmrs/web/test/NewPatientFormControllerTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/messages.properties (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/tags/obsValueField.tag (copied) (copied from openmrs/trunk/web/WEB-INF/tags/obsValueField.tag) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/tags/personField.tag (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/admin/encounters/encounterForm.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/admin/maintenance/mrnGenerator.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/portlets/patientDemographics.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/portlets/patientHeader.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/portlets/patientOverview.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/portlets/patientRegimenCompleted.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/portlets/patientRegimenCurrent.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/portlets/personRelationships.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/scripts/drugOrder.js.withjstl (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/test.jsp (deleted)
• openmrs/branches/data_synchronization_bidirectional/web/test/readme.txt (copied) (copied from openmrs/trunk/web/test/readme.txt) (view diffs)