Build: #436 was successful Changes by 5 people

Build result summary

Details

Completed
Duration
6 minutes
Labels
None
Revision
dcf417c18c7aa24d8cd1bdaa808dc0fce94235bd dcf417c18c7aa24d8cd1bdaa808dc0fce94235bd
Total tests
3108
Successful since
#434 ()

Tests

  • 0 New failures
  • 0 Existing failures
  • 0 Fixed

Code commits

Author Commit Message Commit date
Wyclif Luyima Wyclif Luyima dcf417c18c7aa24d8cd1bdaa808dc0fce94235bd dcf417c18c7aa24d8cd1bdaa808dc0fce94235bd Merge branch 'master-merged'
Wyclif Luyima Wyclif Luyima ab1f64d53b292469dbb328bba7034abbace32d01 ab1f64d53b292469dbb328bba7034abbace32d01 Applying auto format changes after merging 1.10.x into master
Wyclif Luyima Wyclif Luyima abfc53ae3cf7c9dc4704afbda1ec5533592c2495 abfc53ae3cf7c9dc4704afbda1ec5533592c2495 Follow up to fix failing tests after merging 1.10.x into master
Wyclif Luyima Wyclif Luyima 167641532cd82e2b38d9658a5e1b3b449c748ebb 167641532cd82e2b38d9658a5e1b3b449c748ebb Merge branch '1.10.x' into master-merged
Conflicts:
        .gitignore
        api/pom.xml
        api/src/main/java/org/openmrs/BaseOpenmrsObject.java
        api/src/main/java/org/openmrs/Concept.java
        api/src/main/java/org/openmrs/ConceptMap.java
        api/src/main/java/org/openmrs/ConceptReferenceTerm.java
        api/src/main/java/org/openmrs/Drug.java
        api/src/main/java/org/openmrs/Encounter.java
        api/src/main/java/org/openmrs/FormResource.java
        api/src/main/java/org/openmrs/GlobalProperty.java
        api/src/main/java/org/openmrs/Obs.java
        api/src/main/java/org/openmrs/Order.java
        api/src/main/java/org/openmrs/OrderType.java
        api/src/main/java/org/openmrs/Person.java
        api/src/main/java/org/openmrs/Role.java
        api/src/main/java/org/openmrs/TestOrder.java
        api/src/main/java/org/openmrs/annotation/DisableHandlers.java
        api/src/main/java/org/openmrs/annotation/OpenmrsProfileExcludeFilter.java
        api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java
        api/src/main/java/org/openmrs/aop/LoggingAdvice.java
        api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java
        api/src/main/java/org/openmrs/api/AdministrationService.java
        api/src/main/java/org/openmrs/api/ConceptService.java
        api/src/main/java/org/openmrs/api/EncounterService.java
        api/src/main/java/org/openmrs/api/EventListeners.java
        api/src/main/java/org/openmrs/api/FormService.java
        api/src/main/java/org/openmrs/api/LocationService.java
        api/src/main/java/org/openmrs/api/OrderService.java
        api/src/main/java/org/openmrs/api/PatientService.java
        api/src/main/java/org/openmrs/api/PatientSetService.java
        api/src/main/java/org/openmrs/api/PersonService.java
        api/src/main/java/org/openmrs/api/ProviderService.java
        api/src/main/java/org/openmrs/api/UserService.java
        api/src/main/java/org/openmrs/api/context/Context.java
        api/src/main/java/org/openmrs/api/context/Daemon.java
        api/src/main/java/org/openmrs/api/context/ServiceContext.java
        api/src/main/java/org/openmrs/api/context/UserContext.java
        api/src/main/java/org/openmrs/api/db/ConceptDAO.java
        api/src/main/java/org/openmrs/api/db/OrderDAO.java
        api/src/main/java/org/openmrs/api/db/PatientDAO.java
        api/src/main/java/org/openmrs/api/db/hibernate/AuditableInterceptor.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernateAdministrationDAO.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernateFormDAO.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernatePersonDAO.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernateSessionFactoryBean.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernateUtil.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java
        api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java
        api/src/main/java/org/openmrs/api/handler/ConceptReferenceTermSaveHandler.java
        api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java
        api/src/main/java/org/openmrs/api/impl/CohortServiceImpl.java
        api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
        api/src/main/java/org/openmrs/api/impl/DatatypeServiceImpl.java
        api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java
        api/src/main/java/org/openmrs/api/impl/FormServiceImpl.java
        api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java
        api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
        api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java
        api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java
        api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java
        api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java
        api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java
        api/src/main/java/org/openmrs/attribute/BaseAttribute.java
        api/src/main/java/org/openmrs/customdatatype/CustomDatatypeUtil.java
        api/src/main/java/org/openmrs/customdatatype/SerializingCustomDatatype.java
        api/src/main/java/org/openmrs/customdatatype/datatype/BooleanDatatype.java
        api/src/main/java/org/openmrs/customdatatype/datatype/DateDatatype.java
        api/src/main/java/org/openmrs/customdatatype/datatype/LongFreeTextDatatype.java
        api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java
        api/src/main/java/org/openmrs/migration/MigrationHelper.java
        api/src/main/java/org/openmrs/module/Module.java
        api/src/main/java/org/openmrs/module/ModuleClassLoader.java
        api/src/main/java/org/openmrs/module/ModuleConstants.java
        api/src/main/java/org/openmrs/module/ModuleFactory.java
        api/src/main/java/org/openmrs/module/ModuleFileParser.java
        api/src/main/java/org/openmrs/module/ModuleUtil.java
        api/src/main/java/org/openmrs/module/UpdateFileParser.java
        api/src/main/java/org/openmrs/notification/Note.java
        api/src/main/java/org/openmrs/order/OrderUtil.java
        api/src/main/java/org/openmrs/person/PersonMergeLogData.java
        api/src/main/java/org/openmrs/reporting/export/DataExportFunctions.java
        api/src/main/java/org/openmrs/scheduler/tasks/AutoCloseVisitsTask.java
        api/src/main/java/org/openmrs/util/DatabaseUpdater.java
        api/src/main/java/org/openmrs/util/ExceptionUtil.java
        api/src/main/java/org/openmrs/util/HibernateEnumType.java
        api/src/main/java/org/openmrs/util/HttpClient.java
        api/src/main/java/org/openmrs/util/LocaleUtility.java
        api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java
        api/src/main/java/org/openmrs/util/OpenmrsConstants.java
        api/src/main/java/org/openmrs/util/OpenmrsSecurityManager.java
        api/src/main/java/org/openmrs/util/OpenmrsUtil.java
        api/src/main/java/org/openmrs/util/PrivilegeConstants.java
        api/src/main/java/org/openmrs/validator/BaseCustomizableValidator.java
        api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java
        api/src/main/java/org/openmrs/validator/ConceptValidator.java
        api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
        api/src/main/java/org/openmrs/validator/EncounterRoleValidator.java
        api/src/main/java/org/openmrs/validator/EncounterValidator.java
        api/src/main/java/org/openmrs/validator/LocationValidator.java
        api/src/main/java/org/openmrs/validator/ObsValidator.java
        api/src/main/java/org/openmrs/validator/OrderValidator.java
        api/src/main/java/org/openmrs/validator/PatientProgramValidator.java
        api/src/main/java/org/openmrs/validator/PatientValidator.java
        api/src/main/java/org/openmrs/validator/PersonAttributeTypeValidator.java
        api/src/main/java/org/openmrs/validator/ProgramValidator.java
        api/src/main/java/org/openmrs/validator/RelationshipTypeValidator.java
        api/src/main/java/org/openmrs/validator/UserValidator.java
        api/src/main/java/org/openmrs/validator/ValidateUtil.java
        api/src/main/java/org/openmrs/validator/VisitValidator.java
        api/src/main/resources/hibernate.cfg.xml
        api/src/main/resources/liquibase-schema-only.xml
        api/src/main/resources/liquibase-update-to-latest.xml
        api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSetDerived.hbm.xml
        api/src/main/resources/org/openmrs/api/db/hibernate/Encounter.hbm.xml
        api/src/main/resources/org/openmrs/api/db/hibernate/FormResource.hbm.xml
        api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
        api/src/main/resources/org/openmrs/api/db/hibernate/OrderType.hbm.xml
        api/src/test/java/org/openmrs/ConceptNumericTest.java
        api/src/test/java/org/openmrs/EncounterTest.java
        api/src/test/java/org/openmrs/ObsTest.java
        api/src/test/java/org/openmrs/PatientProgramTest.java
        api/src/test/java/org/openmrs/PersonNameTest.java
        api/src/test/java/org/openmrs/ProviderTest.java
        api/src/test/java/org/openmrs/annotation/OpenmrsProfileExcludeFilterTest.java
        api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java
        api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java
        api/src/test/java/org/openmrs/api/AdministrationServiceTest.java
        api/src/test/java/org/openmrs/api/ConceptServiceTest.java
        api/src/test/java/org/openmrs/api/EncounterServiceTest.java
        api/src/test/java/org/openmrs/api/FormServiceTest.java
        api/src/test/java/org/openmrs/api/LocationServiceTest.java
        api/src/test/java/org/openmrs/api/ObsServiceTest.java
        api/src/test/java/org/openmrs/api/OrderServiceTest.java
        api/src/test/java/org/openmrs/api/PatientServiceTest.java
        api/src/test/java/org/openmrs/api/PersonServiceTest.java
        api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java
        api/src/test/java/org/openmrs/api/ProviderServiceTest.java
        api/src/test/java/org/openmrs/api/UserServiceTest.java
        api/src/test/java/org/openmrs/api/VisitServiceTest.java
        api/src/test/java/org/openmrs/api/context/DaemonTest.java
        api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java
        api/src/test/java/org/openmrs/api/db/PatientDAOTest.java
        api/src/test/java/org/openmrs/api/db/UserDAOTest.java
        api/src/test/java/org/openmrs/api/db/hibernate/AuditableInterceptorTest.java
        api/src/test/java/org/openmrs/hl7/handler/ORUR01HandlerTest.java
        api/src/test/java/org/openmrs/module/BaseModuleActivatorTest.java
        api/src/test/java/org/openmrs/module/ModuleActivatorTest.java
        api/src/test/java/org/openmrs/module/ModuleUtilTest.java
        api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java
        api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
        api/src/test/java/org/openmrs/util/HttpClientTest.java
        api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java
        api/src/test/java/org/openmrs/util/databasechange/DatabaseUpgradeTestUtil.java
        api/src/test/java/org/openmrs/validator/ConceptValidatorTest.java
        api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java
        api/src/test/java/org/openmrs/validator/LocationValidatorTest.java
        api/src/test/java/org/openmrs/validator/PatientProgramValidatorTest.java
        api/src/test/java/org/openmrs/validator/PatientValidatorTest.java
        api/src/test/java/org/openmrs/validator/PersonAttributeTypeValidatorTest.java
        api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java
        api/src/test/java/org/openmrs/validator/ProgramValidatorTest.java
        api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java
        api/src/test/java/org/openmrs/validator/RelationshipTypeValidatorTest.java
        api/src/test/java/org/openmrs/validator/ValidateUtilTest.java
        api/src/test/java/org/openmrs/validator/VisitValidatorTest.java
        api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml
        api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
        api/src/test/resources/org/openmrs/api/include/OrderServiceTest-deleteObsThatReference.xml
        api/src/test/resources/org/openmrs/include/initialInMemoryTestDataSet.xml
        api/src/test/resources/org/openmrs/include/standardTestDataset.xml
        api/src/test/resources/org/openmrs/module/include/test1-1.0-SNAPSHOT.omod
        api/src/test/resources/org/openmrs/module/include/test1-2.0-SNAPSHOT.omod
        api/src/test/resources/org/openmrs/module/include/test2-1.0-SNAPSHOT.omod
        api/src/test/resources/org/openmrs/module/include/test3-1.0-SNAPSHOT.omod
        api/src/test/resources/org/openmrs/module/include/test3-2.0-SNAPSHOT.omod
        api/src/test/resources/org/openmrs/validator/include/VisitValidatorTest.xml
        pom.xml
        test/pom.xml
        tools/pom.xml
        web/pom.xml
        web/src/main/java/org/openmrs/module/web/WebModuleUtil.java
        web/src/main/java/org/openmrs/module/web/controller/ModuleListController.java
        web/src/main/java/org/openmrs/web/Listener.java
        web/src/main/java/org/openmrs/web/WebDaemon.java
        web/src/main/java/org/openmrs/web/attribute/handler/LongFreeTextTextareaHandler.java
        web/src/main/java/org/openmrs/web/controller/ConceptFormController.java
        web/src/main/java/org/openmrs/web/controller/ConceptFormValidator.java
        web/src/main/java/org/openmrs/web/controller/OptionsFormController.java
        web/src/main/java/org/openmrs/web/controller/PortletController.java
        web/src/main/java/org/openmrs/web/controller/RegimenPortletController.java
        web/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java
        web/src/main/java/org/openmrs/web/controller/concept/ConceptSourceListController.java
        web/src/main/java/org/openmrs/web/controller/customdatatype/CustomValueController.java
        web/src/main/java/org/openmrs/web/controller/form/FieldTypeListController.java
        web/src/main/java/org/openmrs/web/controller/form/FormFormController.java
        web/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java
        web/src/main/java/org/openmrs/web/controller/order/OrderDrugFormController.java
        web/src/main/java/org/openmrs/web/controller/order/OrderDrugListController.java
        web/src/main/java/org/openmrs/web/controller/order/OrderFormController.java
        web/src/main/java/org/openmrs/web/controller/order/OrderListByPatientController.java
        web/src/main/java/org/openmrs/web/controller/order/OrderListController.java
        web/src/main/java/org/openmrs/web/controller/patient/MergePatientsFormController.java
        web/src/main/java/org/openmrs/web/controller/patient/PatientDashboardController.java
        web/src/main/java/org/openmrs/web/controller/patient/PatientIdentifierTypeFormController.java
        web/src/main/java/org/openmrs/web/controller/patient/ShortPatientFormController.java
        web/src/main/java/org/openmrs/web/controller/patient/ShortPatientFormValidator.java
        web/src/main/java/org/openmrs/web/controller/person/AddPersonController.java
        web/src/main/java/org/openmrs/web/controller/program/PatientProgramFormController.java
        web/src/main/java/org/openmrs/web/controller/visit/ConfigureVisitsFormController.java
        web/src/main/java/org/openmrs/web/controller/visit/VisitFormController.java
        web/src/main/java/org/openmrs/web/controller/visit/VisitListController.java
        web/src/main/java/org/openmrs/web/dwr/ConceptListItem.java
        web/src/main/java/org/openmrs/web/dwr/DWRConceptService.java
        web/src/main/java/org/openmrs/web/dwr/DWREncounterService.java
        web/src/main/java/org/openmrs/web/dwr/DWROrderService.java
        web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java
        web/src/main/java/org/openmrs/web/dwr/DWRProviderService.java
        web/src/main/java/org/openmrs/web/dwr/DrugOrderListItem.java
        web/src/main/java/org/openmrs/web/filter/StartupFilter.java
        web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java
        web/src/main/java/org/openmrs/web/filter/initialization/TestInstallUtil.java
        web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java
        web/src/main/java/org/openmrs/web/filter/update/UpdateFilterModel.java
        web/src/main/java/org/openmrs/web/filter/util/FilterUtil.java
        web/src/main/java/org/openmrs/web/filter/util/LocalizationTool.java
        web/src/main/java/org/openmrs/web/form/visit/ConfigureVisitsForm.java
        web/src/main/java/org/openmrs/web/taglib/FormatTag.java
        web/src/main/java/org/openmrs/web/taglib/PortletTag.java
        web/src/main/java/org/openmrs/web/taglib/RequireTag.java
        web/src/main/java/org/openmrs/web/taglib/fieldgen/DrugOrderDiscontinuedReasonHandler.java
        web/src/main/resources/openmrs-servlet.xml
        web/src/main/resources/org/openmrs/web/filter/initialization/installmethod.vm
        web/src/main/resources/org/openmrs/web/filter/initialization/remotedetails.vm
        web/src/test/java/org/openmrs/module/web/WebModuleUtilTest.java
        web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java
        web/src/test/java/org/openmrs/web/WebUtilTest.java
        web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
        web/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java
        web/src/test/java/org/openmrs/web/controller/form/FieldFormControllerTest.java
        web/src/test/java/org/openmrs/web/controller/person/AddPersonControllerTest.java
        web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java
        web/src/test/java/org/openmrs/web/dwr/DWRPatientServiceTest.java
        web/src/test/java/org/openmrs/web/taglib/FormatTagTest.java
        web/src/test/java/org/openmrs/web/test/TestContextLoader.java
        webapp/pom.xml
        webapp/src/main/resources/liquibase-demo-data.zip
        webapp/src/main/webapp/WEB-INF/messages.properties
        webapp/src/main/webapp/WEB-INF/messages_es.properties
        webapp/src/main/webapp/WEB-INF/messages_fa.properties
        webapp/src/main/webapp/WEB-INF/messages_hi.properties
        webapp/src/main/webapp/WEB-INF/messages_in_ID.properties
        webapp/src/main/webapp/WEB-INF/messages_pt.properties
        webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld
        webapp/src/main/webapp/WEB-INF/tags/errorNotify.tag
        webapp/src/main/webapp/WEB-INF/template/banner.jsp
        webapp/src/main/webapp/WEB-INF/template/gutter.jsp
        webapp/src/main/webapp/WEB-INF/template/headerFull.jsp
        webapp/src/main/webapp/WEB-INF/template/headerMinimal.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptClassForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDatatypeForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugList.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptProposalForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSetDerivedForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceList.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptStopWordForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterRoleForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/encounters/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeList.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/forms/formList.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/forms/formResources.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/forms/include/fieldEdit.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/forms/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/hl7/hl7InArchiveMigration.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/hl7/hl7SourceForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/hl7/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/index.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/locations/addressTemplate.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/locations/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/locations/locationAttributeType.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/locations/locationTag.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/locations/locationTagEdit.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/maintenance/implementationIdForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/maintenance/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/modules/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/modules/moduleList.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/observations/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/orders/choosePatient.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugList.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/orders/orderListByPatient.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/orders/orderTypeForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/orders/orderTypeList.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/patients/findDuplicatePatients.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/patients/include/editPatientIdentifier.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/patients/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/patients/mergePatientsForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/patients/patientForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/person/addPerson.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/person/include/editPersonInfo.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/person/include/showPersonInfo.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/person/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/person/personAttributeTypeForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/person/personForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/person/relationshipTypeForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/programs/conversionForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/programs/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/programs/programForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/programs/programList.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/programs/workflowForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/provider/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/provider/providerAttributeTypeForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/provider/providerForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/scheduler/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerList.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/users/alertForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/users/alertList.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/users/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/users/privilegeForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/users/roleList.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/visits/configureVisits.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/visits/localHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/visits/visitAttributeTypeForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/visits/visitTypeForm.jsp
        webapp/src/main/webapp/WEB-INF/view/dictionary/concept.jsp
        webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
        webapp/src/main/webapp/WEB-INF/view/dictionary/conceptStatsForm.jsp
        webapp/src/main/webapp/WEB-INF/view/dictionary/index.jsp
        webapp/src/main/webapp/WEB-INF/view/help.jsp
        webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp
        webapp/src/main/webapp/WEB-INF/view/patientDashboardForm.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/addPersonForm.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/cohort.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/customMostRecentObs.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/nameLayout.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/patientDemographics.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/patientEncounters.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/patientGraphs.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/patientHeader.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCurrent.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/personRelationships.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/welcome.jsp
        webapp/src/main/webapp/WEB-INF/view/scripts/calendar/calendar.js
        webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl
        webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/jquery-ui-datepicker-i18n.js
        webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js
        webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js
        webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl
        webapp/src/main/webapp/WEB-INF/view/scripts/timepicker/timepicker.js
        webapp/src/main/webapp/WEB-INF/web.xml
        webapp/src/main/webapp/admin/orders/index.jsp
        webapp/src/main/webapp/dictionary/conceptForm.js
        webapp/src/main/webapp/errorhandler.jsp
        webapp/src/main/webapp/openmrs.css
        webapp/src/main/webapp/openmrs.js
Wyclif Luyima Wyclif Luyima 7b8309de81cfc27e018fef0d7e92caf55905ddb8 7b8309de81cfc27e018fef0d7e92caf55905ddb8 Reverting all order entry related commits previously made prior to 1.10
Revert "A few formatting changes made by the autoformatter..."

This reverts commit 8560389ac9e5cfee5495036078b4331ff4c28e5e.

Conflicts:
        api/src/main/java/org/openmrs/api/OrderService.java

Revert "Add @since 1.10 to OrderService methods - TRUNK-3503"

This reverts commit df653a2908fb1950fd9393dffc7e75a63d730f02.

Revert "Added readonly transactional and privilege checks to OrderService"

This reverts commit e4172b74bc397123cf55ca613a781b91c631b85f.

Conflicts:
        api/src/main/java/org/openmrs/api/OrderService.java

Revert "Merging order-entry branch to trunk rev:28043"

This reverts commit f1ff17ad989a327f5e4abddeaba553821cd23bd3.

Conflicts:
        api/src/test/java/org/openmrs/api/OrderServiceTest.java
        api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml
        api/src/test/resources/org/openmrs/api/include/OrderServiceTest-ordersList.xml

Fixed missed code when resolving conflicts for previous reverts

Revert "Merging order-entry to trunk rev:20830 - rev:28000"

This reverts commit e617b404d5f2b70187331158dcd7db08311a2b1f.

Conflicts:
        api/src/main/java/org/openmrs/BaseOrderable.java
        api/src/main/java/org/openmrs/Drug.java
        api/src/main/java/org/openmrs/GenericDrug.java
        api/src/main/java/org/openmrs/Order.java
        api/src/main/java/org/openmrs/TestOrder.java
        api/src/main/java/org/openmrs/api/OrderService.java
        api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
        api/src/main/java/org/openmrs/api/handler/OrderSaveHandler.java
        api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
        api/src/main/java/org/openmrs/order/OrderUtil.java
        api/src/main/java/org/openmrs/util/OpenmrsConstants.java
        api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
        api/src/main/java/org/openmrs/validator/OrderValidator.java
        api/src/main/resources/liquibase-update-to-latest.xml
        api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
        api/src/test/java/org/openmrs/api/OrderServiceTest.java
        api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
        api/src/test/resources/org/openmrs/include/standardTestDataset.xml
        api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml
        web/src/main/java/org/openmrs/web/dwr/DWROrderService.java
        web/src/main/java/org/openmrs/web/dwr/DrugOrderListItem.java
        webapp/src/main/webapp/WEB-INF/messages.properties
        webapp/src/main/webapp/WEB-INF/tags/orderableField.tag
        webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp
        webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp
        webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
        webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl

Fixed failing test due to test data set that doesn't match the data model

Applying auto format changes

Removed un needed changeset related to order entry since we reverted order entry work committed in master before 1.10

Configuration changes

Some of the jobs or stages referenced by this result no longer exist.

Jira issues

IssueDescriptionStatus
17 more issues…
Unknown Issue TypeTRUNK-2694Could not obtain issue details from Jira
Unknown Issue TypeTRUNK-3169Could not obtain issue details from Jira
Unknown Issue TypeTRUNK-3503Could not obtain issue details from Jira
Unknown Issue TypeTRUNK-3974Could not obtain issue details from Jira
Unknown Issue TypeTRUNK-3982Could not obtain issue details from Jira