OpenMRS

Timestamp:

08/28/08 18:08:01 (3 months ago)

Author:

mseaton

Message:

synchronization-bidirectional-branch: Merge from [5322] to [5385]

Files:

• openmrs/branches/data_synchronization_bidirectional/.classpath (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/build.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/Encounter.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/ProgramWorkflow.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/db/ContextDAO.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/HibernatePatientDAO.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/propertyeditor/DrugEditor.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/dwr/DWRPersonService.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/dwr/PersonListItem.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/BaseContextSensitiveTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/BaseContextSensitiveTest.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/BaseModuleContextSensitiveTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/BaseModuleContextSensitiveTest.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/CreateInitialDataSet.java (deleted)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/OpenmrsTestAnnotationsTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/OpenmrsTestAnnotationsTest.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/OpenmrsTestsTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/TestUtil.java (deleted)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/TestingApplicationContext.xml (deleted)
• 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/ContextDAOTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/db/ContextDAOTest.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/db/EncounterDAOTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/db/include/contextDAOTest.xml (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/db/include/contextDAOTest.xml) (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/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/include/standardTestDataset.xml (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/include/standardTestDataset.xml) (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/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/package.html (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/package.html) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/propertyeditor (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/propertyeditor) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/propertyeditor/DrugEditorTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/propertyeditor/DrugEditorTest.java) (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/PatientSearchParameterTest.java (modified) (view diffs)
• 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/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/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/synchronization/engine/SyncAdminTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/synchronization/engine/SyncBaseTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/testutil (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/testutil) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/testutil/BaseContextSensitiveTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/testutil/BaseContextSensitiveTest.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/testutil/BaseModuleContextSensitiveTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/testutil/BaseModuleContextSensitiveTest.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/testutil/CreateInitialDataSet.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/testutil/CreateInitialDataSet.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/testutil/SkipBaseSetup.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/testutil/SkipBaseSetup.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/testutil/SkipBaseSetupAnnotationExecutionListener.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/testutil/SkipBaseSetupAnnotationExecutionListener.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/testutil/TestUtil.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/testutil/TestUtil.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/testutil/TestingApplicationContext.xml (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/testutil/TestingApplicationContext.xml) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/testutil/package.html (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/testutil/package.html) (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/test/web/org/openmrs/web/test/dwr (copied) (copied from openmrs/trunk/test/web/org/openmrs/web/test/dwr) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/web/org/openmrs/web/test/dwr/DWRPersonServiceTest.java (copied) (copied from openmrs/trunk/test/web/org/openmrs/web/test/dwr/DWRPersonServiceTest.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/admin/maintenance/serverLog.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/admin/person/personAttributeTypeForm.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/uncaughtException.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/errorhandler.jsp (modified) (view diffs)