Build #476

Plan branch:

Build: #476 failed

Job: Default Job failed

Stages & jobs

  1. Default Stage

Code commits

openmrs-core master

  • Wyclif Luyima

    Wyclif Luyima 9b546c6dd646ab9fe5837a154549c9cc10f9c46f

    Revert "TRUNK-4586: Warning During Compilation - KeepAliveCache"
    This reverts commit 3615e91d2a6a8bab4077ded5f7208ea104e11cb8.

    • api/src/main/java/org/openmrs/util/MemoryLeakUtil.java (version 9b546c6dd646ab9fe5837a154549c9cc10f9c46f)
  • Wyclif Luyima

    Wyclif Luyima 5af04698d67f30c296fd3ed55dd7c6011e90943a

    Upgrade to java 8 - TRUNK-4583

    • api/src/main/java/org/openmrs/aop/LoggingAdvice.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • api/src/main/java/org/openmrs/scheduler/tasks/CheckInternetConnectivityTask.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • pom.xml (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/bean/DatatableRequest.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/concept/ConceptClassListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/concept/ConceptDatatypeListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/encounter/EncounterTypeListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/encounter/LocationListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/form/FieldTypeListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/form/FormListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/hl7/Hl7SourceListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/patient/PatientIdentifierTypeListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/patient/PatientListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/person/RelationshipTypeListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/program/PatientProgramFormController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/program/ProgramListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/program/StateConversionListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/user/PrivilegeListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
    • web/src/main/java/org/openmrs/web/controller/visit/VisitTypeListController.java (version 5af04698d67f30c296fd3ed55dd7c6011e90943a)
  • Wyclif Luyima

    Wyclif Luyima bc715cbd8f5bf18a93ebbebd59d5daecfa92ac29

    Revert "Doing some file formatting"
    This reverts commit a23ac68925837862ee6f1ad8d33994494d6472f1.

    • api/src/main/java/org/openmrs/util/MemoryLeakUtil.java (version bc715cbd8f5bf18a93ebbebd59d5daecfa92ac29)
    • api/src/test/java/org/openmrs/ConceptTest.java (version bc715cbd8f5bf18a93ebbebd59d5daecfa92ac29)
  • Rafal Korytkowski

    Rafal Korytkowski 046bea1c54e4565ad15755b727bdb77e0edb6a6a

    Fixed formatting

    • web/src/main/java/org/openmrs/web/taglib/ListPickerTag.java (version 046bea1c54e4565ad15755b727bdb77e0edb6a6a)
  • Rafal Korytkowski

    Rafal Korytkowski 49484e4d9f3efe9e515ca716f4d40051d459dbb7

    TRUNK-4680 Removed a hacky line

    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 49484e4d9f3efe9e515ca716f4d40051d459dbb7)
  • Rafal Korytkowski

    Rafal Korytkowski a155105fee62835929bdda310218c2d3bdf64583

    Set travis to build against JDK 7 and 8. Dropped JDK 6.

    • .travis.yml (version a155105fee62835929bdda310218c2d3bdf64583)
  • Rafal Korytkowski

    Rafal Korytkowski da3283724264b6c319a89cb89f5843d278c84759

    TRUNK-4364 Changing version after merging hibernate4 branch

    • api/pom.xml (version da3283724264b6c319a89cb89f5843d278c84759)
    • pom.xml (version da3283724264b6c319a89cb89f5843d278c84759)
    • test/pom.xml (version da3283724264b6c319a89cb89f5843d278c84759)
    • tools/pom.xml (version da3283724264b6c319a89cb89f5843d278c84759)
    • web/pom.xml (version da3283724264b6c319a89cb89f5843d278c84759)
    • webapp/pom.xml (version da3283724264b6c319a89cb89f5843d278c84759)
  • Rafal Korytkowski

    Rafal Korytkowski 1464cd7f17140b136580c70d7f3f8114ab6f08e8

    Merge pull request #1495 from openmrs/hibernate4
    TRUNK-4364 Upgrade to Hibernate 4

  • Rafal Korytkowski

    Rafal Korytkowski fa373a4a3e9db79e339b968b2735c17db6e9393e

    TRUNK-4364 Fixed Hibernate version

    • pom.xml (version fa373a4a3e9db79e339b968b2735c17db6e9393e)
  • Rafal Korytkowski

    Rafal Korytkowski dcfd3dec82a79e1f01b1473581d2bd7fa518f633

    Merge branch 'master' of https://github.com/openmrs/openmrs-core into hibernate4
    Conflicts:
            api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java

  • Daniel Kayiwa

    Daniel Kayiwa d8a9a723d38c8154d08e9fe19b0a39c937b419f5

    Merge pull request #1491 from midnighteuler/TRUNK-4497
    TRUNK-4497: Hide or disable (option of selecting) a child role instead o...

  • Daniel Kayiwa

    Daniel Kayiwa aee388c2c382a0152858fc4b84b04b27d87e47ac m

    Merge pull request #1493 from rkorytkowski/hibernate4
    TRUNK-4364 / TRUNK-4677 Upgrade to Hibernate 4 and Search 5

  • Rafal Korytkowski

    Rafal Korytkowski 212ce2f0fd7893431bc1eecb3de9c341c7d280fc m

    TRUNK-4364 / TRUNK-4677 Upgrade to Hibernate 4 and Search 5

    • api/pom.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/Concept.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/ConceptClass.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/ConceptDatatype.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/ConceptMap.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/ConceptName.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/ConceptReferenceTerm.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/Drug.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/DrugReferenceMap.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateAdministrationDAO.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernatePersonDAO.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateSessionFactoryBean.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateUtil.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/db/hibernate/NativeIfNotAssignedIdentityGenerator.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/db/hibernate/search/ConceptNameSimilarity.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/util/HibernateEnumType.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/util/MemoryLeakUtil.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/java/org/openmrs/xml/OpenmrsLabelLogic.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/applicationContext-service.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/hibernate.default.properties (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ActiveListItem.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ActiveListType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Cohort.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Concept.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ConceptClass.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDatatype.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ConceptMap.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ConceptMapType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ConceptProposal.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTerm.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTermMap.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSource.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStateConversion.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Drug.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/DrugReferenceMap.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Encounter.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/EncounterRole.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/EncounterType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Field.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/FieldType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/FormField.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/FormResource.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Location.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/LocationAttributeType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/LocationTag.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Note.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/NoteType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Obs.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/OrderFrequency.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/OrderType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/PatientIdentifierType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/PatientProgram.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/PatientState.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Person.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/PersonAddress.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/PersonAttribute.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/PersonAttributeType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/PersonName.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Privilege.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Program.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ProgramWorkflow.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ProgramWorkflowState.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Provider.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ProviderAttribute.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ProviderAttributeType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Relationship.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/RelationshipType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Role.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/User.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Visit.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/VisitAttribute.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/VisitAttributeType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/main/resources/org/openmrs/api/db/hibernate/VisitType.hbm.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/test/java/org/openmrs/api/db/SerializedObjectDAOTest.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/test/java/org/openmrs/api/db/hibernate/HibernateObsDAOTest.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • pom.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • web/src/test/java/org/openmrs/web/dwr/DWRConceptServiceTest.java (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
    • webapp/src/main/webapp/WEB-INF/web.xml (version 212ce2f0fd7893431bc1eecb3de9c341c7d280fc)
  • Michael Souza <mike@michaelsouza.com>

    Michael Souza <mike@michaelsouza.com> fcd4655613e40cd1642e38cf54e9ec14784e54fb

    TRUNK-4497: Hide or disable (option of selecting) a child role instead of throwing an error

    • api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • api/src/test/java/org/openmrs/api/UserServiceTest.java (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • web/src/main/java/org/openmrs/web/controller/user/RoleFormController.java (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • web/src/main/java/org/openmrs/web/taglib/ListPickerTag.java (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • webapp/src/main/webapp/WEB-INF/messages_de.properties (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • webapp/src/main/webapp/WEB-INF/messages_es.properties (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
    • webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp (version fcd4655613e40cd1642e38cf54e9ec14784e54fb)
  • Rafal Korytkowski

    Rafal Korytkowski 3aec8d30368c114d7e92f5f10590efe47c377e9a m

    TRUNK-4695 Removed servlet

    • api/src/main/java/org/openmrs/util/DatabaseUtil.java (version 3aec8d30368c114d7e92f5f10590efe47c377e9a)
    • web/src/main/java/org/openmrs/web/servlet/MRNGeneratorServlet.java (version 3aec8d30368c114d7e92f5f10590efe47c377e9a)
  • Rafal Korytkowski

    Rafal Korytkowski 43f92d51f39043e164757bfc9f10029876905cfc m

    TRUNK-4695 Removed deprecated methods

    • api/src/main/java/org/openmrs/api/AdministrationService.java (version 43f92d51f39043e164757bfc9f10029876905cfc)
    • api/src/main/java/org/openmrs/api/db/AdministrationDAO.java (version 43f92d51f39043e164757bfc9f10029876905cfc)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateAdministrationDAO.java (version 43f92d51f39043e164757bfc9f10029876905cfc)
    • api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java (version 43f92d51f39043e164757bfc9f10029876905cfc)
  • Rafal Korytkowski

    Rafal Korytkowski 1ca473a8c4b131d6f6175910018d3d1077db6333 m

    Merge pull request #1482 from StasPereverziev/hibernate4
    Add method executeSQLWithSession that works with Session

  • Stanislav Pereverziev <staspereverzev@gmail.com>

    Stanislav Pereverziev <staspereverzev@gmail.com> 7723bcc1f82e65f8021a5439b8bb92b94b468a20 m

    Fix code review issues

    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateAdministrationDAO.java (version 7723bcc1f82e65f8021a5439b8bb92b94b468a20)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version 7723bcc1f82e65f8021a5439b8bb92b94b468a20)
    • api/src/main/java/org/openmrs/util/DatabaseUtil.java (version 7723bcc1f82e65f8021a5439b8bb92b94b468a20)
    • api/src/main/java/org/openmrs/util/databasechange/ConvertOrderersToProviders.java (version 7723bcc1f82e65f8021a5439b8bb92b94b468a20)
    • api/src/main/java/org/openmrs/util/databasechange/DuplicateEncounterRoleNameChangeSet.java (version 7723bcc1f82e65f8021a5439b8bb92b94b468a20)
    • api/src/main/java/org/openmrs/util/databasechange/DuplicateEncounterTypeNameChangeSet.java (version 7723bcc1f82e65f8021a5439b8bb92b94b468a20)
    • api/src/main/java/org/openmrs/util/databasechange/DuplicateLocationAttributeTypeNameChangeSet.java (version 7723bcc1f82e65f8021a5439b8bb92b94b468a20)
    • api/src/main/java/org/openmrs/util/databasechange/ProgramValidatorChangeSet.java (version 7723bcc1f82e65f8021a5439b8bb92b94b468a20)
    • api/src/test/java/org/openmrs/api/AdministrationServiceTest.java (version 7723bcc1f82e65f8021a5439b8bb92b94b468a20)
    • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeIT.java (version 7723bcc1f82e65f8021a5439b8bb92b94b468a20)
    • web/src/main/java/org/openmrs/web/filter/util/FilterUtil.java (version 7723bcc1f82e65f8021a5439b8bb92b94b468a20)
  • Rafal Korytkowski

    Rafal Korytkowski 52027fbdd70841177cb166ec2ae67a6b0883a23d m

    Merge branch 'master' into hibernate4

  • Stanislav <staspereverzev@gmail.com>

    Stanislav <staspereverzev@gmail.com> 681124705555cd2fc7a56b96d6f648a60ad6204b m

    Add method executeSQLWithSession that works with Session

    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateAdministrationDAO.java (version 681124705555cd2fc7a56b96d6f648a60ad6204b)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version 681124705555cd2fc7a56b96d6f648a60ad6204b)
    • api/src/main/java/org/openmrs/util/DatabaseUtil.java (version 681124705555cd2fc7a56b96d6f648a60ad6204b)
    • api/src/main/java/org/openmrs/util/databasechange/ConvertOrderersToProviders.java (version 681124705555cd2fc7a56b96d6f648a60ad6204b)
    • api/src/main/java/org/openmrs/util/databasechange/DuplicateEncounterRoleNameChangeSet.java (version 681124705555cd2fc7a56b96d6f648a60ad6204b)
    • api/src/main/java/org/openmrs/util/databasechange/DuplicateEncounterTypeNameChangeSet.java (version 681124705555cd2fc7a56b96d6f648a60ad6204b)
    • api/src/main/java/org/openmrs/util/databasechange/DuplicateLocationAttributeTypeNameChangeSet.java (version 681124705555cd2fc7a56b96d6f648a60ad6204b)
    • api/src/main/java/org/openmrs/util/databasechange/ProgramValidatorChangeSet.java (version 681124705555cd2fc7a56b96d6f648a60ad6204b)
    • api/src/test/java/org/openmrs/api/AdministrationServiceTest.java (version 681124705555cd2fc7a56b96d6f648a60ad6204b)
    • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeIT.java (version 681124705555cd2fc7a56b96d6f648a60ad6204b)
    • web/src/main/java/org/openmrs/web/filter/util/FilterUtil.java (version 681124705555cd2fc7a56b96d6f648a60ad6204b)
  • Rafal Korytkowski

    Rafal Korytkowski dd393898257e685bd4ff64739bc699379f57f90e m

    Setting version for branch

    • api/pom.xml (version dd393898257e685bd4ff64739bc699379f57f90e)
    • pom.xml (version dd393898257e685bd4ff64739bc699379f57f90e)
    • release-test/pom.xml (version dd393898257e685bd4ff64739bc699379f57f90e)
    • test/pom.xml (version dd393898257e685bd4ff64739bc699379f57f90e)
    • tools/pom.xml (version dd393898257e685bd4ff64739bc699379f57f90e)
    • web/pom.xml (version dd393898257e685bd4ff64739bc699379f57f90e)
    • webapp/pom.xml (version dd393898257e685bd4ff64739bc699379f57f90e)