OpenMRS

Timestamp:

04/08/08 05:54:20 (9 months ago)

Author:

mcunderlik

Message:

data_synchronization_bidirectional branch. Fixes for Concept dictionary management:
- changed Concept back to generator=assigned in order to preserve same concept_ids in case of export from stagging server to a network of sync-ing servers
- changed fetchGuid() in the interceptor to avoid re-loading obj instances and evicting them
- fixed bug in the interceptor with guid assignment to objects with null guids on update
- added code-around hibernate nullpointer exception
- cleaned up failing/incorrect unit tests
- added log4j entry for tests

Files:

• openmrs/branches/data_synchronization_bidirectional/metadata/api/hibernate/org/openmrs/api/db/hibernate/Concept.hbm.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/api/log4j/log4j.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/ConceptService.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/db/hibernate/HibernateSynchronizationInterceptor.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/web/org/openmrs/web/controller/ConceptFormController.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/synchronization/engine/SyncConceptStageTest.java (added)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/synchronization/engine/SyncConceptTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/synchronization/engine/SyncPatientTest.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/synchronization/engine/SyncSourceJournalTest.java (deleted)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/synchronization/engine/SyncStrategyFileTest.java (deleted)