Build #1,064

Plan branch:
OpenMRS Core Master

Build: #1064 failed Changes by Daniel Kayiwa and James deGraft-Johnson

Stages & jobs

  1. Build and Test

  2. Deploy

  3. Release

    Requires a user to start manually

Code commits

openmrs-core

  • Daniel Kayiwa

    Daniel Kayiwa 62bc930912dd482f28f7de8539c50c54eb91d25c

    Merge pull request #1590 from jdegraft/TRUNK-4747
    TRUNK-4747

  • James deGraft-Johnson

    James deGraft-Johnson 44bbee6bac0705903c0e2ba3231d1d40225b4c50

    TRUNK-4747 Move allergyapi into core - changes following review - initial commit whiles openmrs is setup for changes - commit to enable build of 1.8, 1.9, 1.10 to enable build of webservices.rest - tested move of allergyapi to openmrs-core - changes following review with no conflicts Changes following review - remove problems from patient dashboard - remove some commented out code - added allergyapi tests - remove activelist feature - changeset - remove activelist tables - fixed some errors introduced by rebase - fixed error from rebase

    • api/src/main/java/org/openmrs/Allergen.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/AllergenType.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/Allergies.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/Allergy.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/AllergyConstants.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/AllergyProperties.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/AllergyReaction.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/AllergySeverity.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/AllergyType.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/MigrateAllergiesChangeSet.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/activelist/ActiveListItem.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/activelist/ActiveListType.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/activelist/Allergy.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/activelist/AllergySeverity.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/activelist/AllergyType.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/activelist/Problem.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/activelist/ProblemModifier.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/api/ActiveListService.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/api/PatientService.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/api/context/Context.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/api/context/ServiceContext.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/api/db/ActiveListDAO.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/api/db/PatientDAO.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateActiveListDAO.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/api/impl/ActiveListServiceImpl.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/util/PrivilegeConstants.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/java/org/openmrs/validator/AllergyValidator.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/resources/applicationContext-service.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/resources/hibernate.cfg.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/resources/liquibase-update-to-latest.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ActiveListAllergy.hbm.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ActiveListItem.hbm.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ActiveListProblem.hbm.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ActiveListType.hbm.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Allergy.hbm.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/main/resources/org/openmrs/api/db/hibernate/AllergyReaction.hbm.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/test/java/org/openmrs/AllergenTest.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/test/java/org/openmrs/AllergiesTest.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/test/java/org/openmrs/api/ActiveListServiceTest.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/test/java/org/openmrs/api/AllergyServiceTest.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/test/java/org/openmrs/api/ObsServiceTest.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/test/java/org/openmrs/api/PatientServiceTest.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/test/java/org/openmrs/validator/AllergyValidatorTest.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/test/resources/org/openmrs/api/include/ActiveListTest.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/test/resources/org/openmrs/api/include/allergyTestDataset.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • api/src/test/resources/org/openmrs/api/include/otherNonCodedConcept.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • web/src/main/java/org/openmrs/web/controller/ActiveListPortletController.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • web/src/main/java/org/openmrs/web/dwr/AllergyListItem.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • web/src/main/java/org/openmrs/web/dwr/ProblemListItem.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • web/src/main/java/org/openmrs/web/taglib/ActiveListWidget.java (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • web/src/main/resources/openmrs-servlet.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • webapp/src/main/webapp/WEB-INF/dwr.xml (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • webapp/src/main/webapp/WEB-INF/view/portlets/activeListAllergy.jsp (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • webapp/src/main/webapp/WEB-INF/view/portlets/activeListProblem.jsp (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)
    • webapp/src/main/webapp/errorhandler.jsp (version 44bbee6bac0705903c0e2ba3231d1d40225b4c50)