OpenMRS

Timestamp:

05/21/08 18:15:49 (8 months ago)

Author:

djazayeri

Message:

sync: merging trunk to data_synchronization_bidir [4272]:[4304]. (Not all unit test failures resulting from merge are fixed yet.)

Files:

• openmrs/branches/data_synchronization_bidirectional/metadata/api/hibernate/org/openmrs/api/db/hibernate/PatientIdentifierType.hbm.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/api/spring/applicationContext-service.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/metadata/model/update-to-latest-db.mysqldiff.sql (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/PatientIdentifierType.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/impl/PatientServiceImpl.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/order/DrugOrderSupport.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/patient (copied) (copied from openmrs/trunk/src/api/org/openmrs/patient) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/patient/IdentifierValidator.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/patient/IdentifierValidator.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/patient/UnallowedIdentifierException.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/patient/UnallowedIdentifierException.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/patient/impl (copied) (copied from openmrs/trunk/src/api/org/openmrs/patient/impl) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/patient/impl/BaseHyphenatedIdentifierValidator.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/patient/impl/BaseHyphenatedIdentifierValidator.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/patient/impl/LuhnIdentifierValidator.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/patient/impl/LuhnIdentifierValidator.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/patient/impl/VerhoeffIdentifierValidator.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/patient/impl/VerhoeffIdentifierValidator.java) (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/api/org/openmrs/validator/PatientValidator.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/validator/PatientValidator.java) (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/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/controller/patient/PatientFormController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/patient/PatientIdentifierTypeFormController.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/controller/patient/ShortPatientModel.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/dwr/DWRPatientService.java (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/src/web/org/openmrs/web/servlet/AuditServlet.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/include/PatientServiceTest-createPatient.xml (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/api/include/PatientServiceTest-createPatientValidIdent.xml (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/api/include/PatientServiceTest-createPatientValidIdent.xml) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/patient (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/patient) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/patient/LuhnIdentifierValidatorTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/patient/LuhnIdentifierValidatorTest.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/patient/VerhoeffIdentifierValidatorTest.java (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/patient/VerhoeffIdentifierValidatorTest.java) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/test/api/org/openmrs/test/util/OpenmrsUtilTest.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/openmrs-servlet.xml (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/encounters/obsDisplay.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/patientDashboardForm.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/WEB-INF/view/portlets/findPatient.jsp (modified) (view diffs)
• openmrs/branches/data_synchronization_bidirectional/web/scripts/dojo/src/widget/openmrs/PatientSearch.js.withjstl (modified) (view diffs)