OpenMRS

Timestamp:

05/22/08 02:57:36 (8 months ago)

Author:

bwolfe

Message:

Merging trunk to api-refactoring branch [4230]:[4312]

Files:

• openmrs/branches/api_refactoring/metadata/api/hibernate/org/openmrs/api/db/hibernate/PatientIdentifierType.hbm.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/metadata/api/spring/applicationContext-service.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/metadata/model/update-to-latest-db.mysqldiff.sql (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/DrugOrder.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/Order.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/PatientIdentifierType.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/PatientProgram.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/PatientState.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/PersonAttribute.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/ProgramWorkflowState.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/Relationship.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/OrderService.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/PatientService.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/db/EncounterDAO.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/impl/EncounterServiceImpl.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/impl/OrderServiceImpl.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/impl/PatientServiceImpl.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/api/impl/UserServiceImpl.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/hl7/handler/ORUR01Handler.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/order/DrugOrderSupport.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/patient (copied) (copied from openmrs/trunk/src/api/org/openmrs/patient) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/patient/IdentifierValidator.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/patient/IdentifierValidator.java) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/patient/UnallowedIdentifierException.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/patient/UnallowedIdentifierException.java) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/patient/impl (copied) (copied from openmrs/trunk/src/api/org/openmrs/patient/impl) (view diffs)
• openmrs/branches/api_refactoring/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/api_refactoring/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/api_refactoring/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/api_refactoring/src/api/org/openmrs/util/OpenmrsConstants.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/util/OpenmrsUtil.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/api/org/openmrs/validator/PatientValidator.java (copied) (copied from openmrs/trunk/src/api/org/openmrs/validator/PatientValidator.java) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/module/web/WebModuleUtil.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/PatientIdentifiersPortletController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/concept/ConceptDrugListController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/encounter/EncounterFormController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/observation/PersonObsFormController.java (copied) (copied from openmrs/trunk/src/web/org/openmrs/web/controller/observation/PersonObsFormController.java) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/patient/NewPatientFormController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/patient/PatientFormController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/patient/PatientIdentifierTypeFormController.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/controller/patient/ShortPatientModel.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/dwr/DWRPatientService.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/servlet/AuditServlet.java (modified) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/taglib/FormatTag.java (copied) (copied from openmrs/trunk/src/web/org/openmrs/web/taglib/FormatTag.java) (view diffs)
• openmrs/branches/api_refactoring/src/web/org/openmrs/web/taglib/ObsTableWidget.java (modified) (view diffs)
• openmrs/branches/api_refactoring/test/api/org/openmrs/test/api/PatientServiceTest.java (modified) (view diffs)
• openmrs/branches/api_refactoring/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/api_refactoring/test/api/org/openmrs/test/patient (copied) (copied from openmrs/trunk/test/api/org/openmrs/test/patient) (view diffs)
• openmrs/branches/api_refactoring/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/api_refactoring/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/api_refactoring/test/api/org/openmrs/test/util/OpenmrsUtilTest.java (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/messages.properties (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/openmrs-servlet.xml (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/taglibs/openmrs.tld (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/tags/drugField.tag (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/concepts/conceptDrugForm.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/concepts/conceptDrugList.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/encounters/encounterForm.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/encounters/obsDisplay.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/observations/personObsForm.jsp (copied) (copied from openmrs/trunk/web/WEB-INF/view/admin/observations/personObsForm.jsp) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/fieldGen/drug.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/patientDashboardForm.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/portlets/findPatient.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/portlets/patientDemographics.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/portlets/patientGraphs.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/WEB-INF/view/portlets/patientRegimen.jsp (modified) (view diffs)
• openmrs/branches/api_refactoring/web/scripts/dojo/src/widget/openmrs/PatientSearch.js.withjstl (modified) (view diffs)