From 05b410063a478ed3c8876195d7c75920cedafa1f Mon Sep 17 00:00:00 2001 From: IamMujuziMoses Date: Tue, 2 Jul 2024 18:02:15 +0300 Subject: [PATCH] RESTWS-939: DiagnosisResource should support formFieldPath property --- .../openmrs2_2/DiagnosisResource2_2.java | 41 +--- .../DiagnosisController2_2Test.java | 52 ----- .../openmrs2_2/DiagnosisResource2_2Test.java | 2 - omod-2.5/pom.xml | 215 ++++++++++++++++++ .../openmrs2_5/DiagnosisResource2_5.java | 89 ++++++++ .../openmrs2_5/DiagnosisResource2_5Test.java | 93 ++++++++ .../DiagnosisResourceTestDataset.xml | 22 ++ omod/pom.xml | 12 + omod/src/main/resources/config.xml | 4 + pom.xml | 2 + 10 files changed, 441 insertions(+), 91 deletions(-) create mode 100644 omod-2.5/pom.xml create mode 100644 omod-2.5/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_5/DiagnosisResource2_5.java create mode 100644 omod-2.5/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_5/DiagnosisResource2_5Test.java create mode 100644 omod-2.5/src/test/resources/DiagnosisResourceTestDataset.xml diff --git a/omod-2.2/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_2/DiagnosisResource2_2.java b/omod-2.2/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_2/DiagnosisResource2_2.java index 27026598d..ec2ca677d 100644 --- a/omod-2.2/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_2/DiagnosisResource2_2.java +++ b/omod-2.2/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_2/DiagnosisResource2_2.java @@ -16,7 +16,6 @@ import org.openmrs.Diagnosis; import org.openmrs.Patient; import org.openmrs.api.context.Context; -import org.openmrs.module.ModuleUtil; import org.openmrs.module.webservices.docs.swagger.core.property.EnumProperty; import org.openmrs.module.webservices.rest.web.ConversionUtil; import org.openmrs.module.webservices.rest.web.RequestContext; @@ -99,9 +98,6 @@ public void purge(Diagnosis diagnosis, RequestContext requestContext) throws Res public DelegatingResourceDescription getRepresentationDescription(Representation representation) { if (representation instanceof DefaultRepresentation) { DelegatingResourceDescription description = new DelegatingResourceDescription(); - if (supportsFormNamespaceAndPath()) { - description.addProperty("formNamespaceAndPath"); - } description.addProperty("uuid"); description.addProperty("diagnosis", Representation.REF); description.addProperty("condition", Representation.REF); @@ -116,9 +112,6 @@ public DelegatingResourceDescription getRepresentationDescription(Representation return description; } else if (representation instanceof FullRepresentation) { DelegatingResourceDescription description = new DelegatingResourceDescription(); - if (supportsFormNamespaceAndPath()) { - description.addProperty("formNamespaceAndPath"); - } description.addProperty("uuid"); description.addProperty("diagnosis"); description.addProperty("patient", Representation.REF); @@ -142,9 +135,6 @@ public DelegatingResourceDescription getRepresentationDescription(Representation public Model getGETModel(Representation rep) { ModelImpl model = (ModelImpl) super.getGETModel(rep); if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) { - if (supportsFormNamespaceAndPath()) { - model.property("formNamespaceAndPath", new StringProperty()); - } model .property("uuid", new StringProperty()) .property("diagnosis", new StringProperty()) @@ -179,9 +169,6 @@ public String getDisplayString(Diagnosis diagnosis) { @Override public DelegatingResourceDescription getCreatableProperties() throws ResourceDoesNotSupportOperationException { DelegatingResourceDescription description = new DelegatingResourceDescription(); - if (supportsFormNamespaceAndPath()) { - description.addProperty("formNamespaceAndPath"); - } description.addRequiredProperty("diagnosis"); description.addRequiredProperty("encounter"); @@ -198,18 +185,15 @@ public DelegatingResourceDescription getCreatableProperties() throws ResourceDoe */ @Override public Model getCREATEModel(Representation rep) { - ModelImpl model = (ModelImpl) super.getCREATEModel(rep); - if (supportsFormNamespaceAndPath()) { - model.property("formNamespaceAndPath", new StringProperty()); - } - model + + return new ModelImpl() .property("diagnosis", new StringProperty()) .property("encounter", new StringProperty()) .property("condition", new StringProperty()) .property("certainty", new StringProperty()) .property("patient", new StringProperty().example("uuid")) .property("rank", new IntegerProperty()); - return model; + } /** @@ -218,9 +202,6 @@ public Model getCREATEModel(Representation rep) { @Override public DelegatingResourceDescription getUpdatableProperties() throws ResourceDoesNotSupportOperationException { DelegatingResourceDescription description = new DelegatingResourceDescription(); - if (supportsFormNamespaceAndPath()) { - description.addProperty("formNamespaceAndPath"); - } description.addRequiredProperty("diagnosis"); description.addRequiredProperty("condition"); description.addRequiredProperty("rank"); @@ -237,18 +218,13 @@ public DelegatingResourceDescription getUpdatableProperties() throws ResourceDoe */ @Override public Model getUPDATEModel(Representation rep) { - ModelImpl model = (ModelImpl) super.getUPDATEModel(rep); - if (supportsFormNamespaceAndPath()) { - model.property("formNamespaceAndPath", new StringProperty()); - } - model + return new ModelImpl() .property("diagnosis", new StringProperty()) .property("condition", new StringProperty()) .property("encounter", new StringProperty()) .property("certainty", new EnumProperty(ConditionVerificationStatus.class)) .property("rank", new IntegerProperty()) .property("voided", new BooleanProperty()); - return model; } @Override @@ -266,13 +242,4 @@ protected PageableResult doSearch(RequestContext context) { } return new NeedsPaging(Context.getDiagnosisService().getDiagnoses(patient, dateFrom), context); } - - /** - * Helper method to check if openmrs version running is form recordable - * - * @return boolean value after check - */ - private boolean supportsFormNamespaceAndPath() { - return ModuleUtil.isOpenmrsVersionInVersions("2.5.* - 9.*"); - } } diff --git a/omod-2.2/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/DiagnosisController2_2Test.java b/omod-2.2/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/DiagnosisController2_2Test.java index 8fe345e33..04ec1d19f 100644 --- a/omod-2.2/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/DiagnosisController2_2Test.java +++ b/omod-2.2/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/DiagnosisController2_2Test.java @@ -11,19 +11,14 @@ import static org.openmrs.ConditionVerificationStatus.CONFIRMED; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.util.LinkedHashMap; import java.util.List; import org.apache.commons.beanutils.PropertyUtils; import org.codehaus.jackson.map.ObjectMapper; -import org.junit.After; import org.junit.Assert; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.openmrs.Concept; import org.openmrs.ConceptName; import org.openmrs.Condition; @@ -32,14 +27,10 @@ import org.openmrs.Patient; import org.openmrs.api.DiagnosisService; import org.openmrs.api.context.Context; -import org.openmrs.module.ModuleFactory; -import org.openmrs.module.ModuleUtil; import org.openmrs.module.webservices.rest.SimpleObject; -import org.openmrs.module.webservices.rest.web.response.ConversionException; import org.openmrs.module.webservices.rest.web.response.ResourceDoesNotSupportOperationException; import org.openmrs.module.webservices.rest.web.v1_0.RestTestConstants2_2; import org.openmrs.module.webservices.rest.web.v1_0.controller.MainResourceControllerTest; -import org.openmrs.util.OpenmrsConstants; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.web.bind.annotation.RequestMethod; @@ -59,9 +50,6 @@ public class DiagnosisController2_2Test extends MainResourceControllerTest { private Concept concept; private ConceptName conceptName; - - @Rule - public ExpectedException expectedException = ExpectedException.none(); @Before public void before() throws Exception { @@ -73,11 +61,6 @@ public void before() throws Exception { this.concept = Context.getConceptService().getConcept(1); this.conceptName = Context.getConceptService().getConceptName(1); } - - @After - public void after() throws Exception { - setCurrentOpenmrsVersion("2.2"); - } /** * @see org.openmrs.module.webservices.rest.web.v1_0.controller.MainResourceControllerTest#getURI() @@ -348,39 +331,4 @@ public void shouldReturnPatientDiagnosis() throws Exception { List diagnoses = result.get("results"); Assert.assertEquals(2, diagnoses.size()); } - - /** - * Helper method to set the current OpenMRS version for tests. - * - * @param currentOpenmrsVersion the openmrs version to set the current version to - */ - private void setCurrentOpenmrsVersion(final String currentOpenmrsVersion) throws NoSuchFieldException, - IllegalAccessException { - - Field versionField = OpenmrsConstants.class.getDeclaredField("OPENMRS_VERSION_SHORT"); - - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); - modifiersField.setInt(versionField, versionField.getModifiers() & ~Modifier.FINAL); - versionField.set(null, currentOpenmrsVersion); - } - - @Test - public void testFormNamespaceAndPath() throws Exception { - final String nonCoded = "Some condition"; - String json = "{ \"diagnosis\":{\"coded\":null,\"specificName\":null,\"nonCoded\":\"" + nonCoded - + "\"},\"condition\":\"" + condition.getUuid() - + "\",\"certainty\":\"" + "CONFIRMED" + "\",\"encounter\":\"" - + encounter.getUuid() + "\",\"rank\":\"" + 2 - + "\",\"voided\":\"" + false + "\"}"; - - handle(newPostRequest(getURI() + "/" + RestTestConstants2_2.UPDATABLE_CODED_DIAGNOSIS_UUID, json)); - Diagnosis newDiagnosis = diagnosisService.getDiagnosisByUuid(RestTestConstants2_2.UPDATABLE_CODED_DIAGNOSIS_UUID); - Assert.assertNotNull(newDiagnosis); - Assert.assertEquals("Some condition", newDiagnosis.getDiagnosis().getNonCoded()); - - setCurrentOpenmrsVersion("2.5.0"); - expectedException.expect(ConversionException.class); - handle(newPostRequest(getURI() + "/" + RestTestConstants2_2.UPDATABLE_CODED_DIAGNOSIS_UUID, json)); - } } diff --git a/omod-2.2/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_2/DiagnosisResource2_2Test.java b/omod-2.2/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_2/DiagnosisResource2_2Test.java index 8958e26c4..e5ef25db6 100644 --- a/omod-2.2/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_2/DiagnosisResource2_2Test.java +++ b/omod-2.2/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_2/DiagnosisResource2_2Test.java @@ -52,7 +52,6 @@ public void validateDefaultRepresentation() throws Exception { assertPropEquals("rank", getObject().getRank()); assertPropEquals("voided", getObject().getVoided()); assertPropPresent("display"); - assertPropNotPresent("formNamespaceAndPath"); } @Override @@ -67,6 +66,5 @@ public void validateFullRepresentation() throws Exception { assertPropEquals("voided", getObject().getVoided()); assertPropPresent("auditInfo"); assertPropPresent("display"); - assertPropNotPresent("formNamespaceAndPath"); } } diff --git a/omod-2.5/pom.xml b/omod-2.5/pom.xml new file mode 100644 index 000000000..92de12e7d --- /dev/null +++ b/omod-2.5/pom.xml @@ -0,0 +1,215 @@ + + + 4.0.0 + + org.openmrs.module + webservices.rest + 2.45.0-SNAPSHOT + + + webservices.rest-omod-2.5 + jar + Rest Web Services 2.5 OMOD + OpenMRS module project for Rest Web Services + + + 2.5.0 + 1.8 + 1.8 + + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-common + ${project.parent.version} + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-common + ${project.parent.version} + tests + test + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-1.8 + ${project.parent.version} + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-1.8 + ${project.parent.version} + tests + test + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-1.9 + ${project.parent.version} + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-1.9 + ${project.parent.version} + tests + test + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-1.10 + ${project.parent.version} + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-1.10 + ${project.parent.version} + tests + test + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-1.11 + ${project.parent.version} + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-1.11 + ${project.parent.version} + tests + test + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-2.0 + ${project.parent.version} + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-2.0 + ${project.parent.version} + tests + test + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-2.2 + ${project.parent.version} + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-2.2 + ${project.parent.version} + tests + test + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-2.3 + ${project.parent.version} + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-2.3 + ${project.parent.version} + tests + test + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-2.4 + ${project.parent.version} + + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-2.4 + ${project.parent.version} + tests + test + + + + org.openmrs.api + openmrs-api + ${openmrs.version.2.5.0} + + + + org.openmrs.api + openmrs-api + test-jar + test + ${openmrs.version.2.5.0} + + + + org.openmrs.web + openmrs-web + ${openmrs.version.2.5.0} + + + + org.openmrs.web + openmrs-web + test-jar + test + ${openmrs.version.2.5.0} + + + + org.openmrs.test + openmrs-test + pom + test + ${openmrs.version.2.5.0} + + + + javax.servlet + javax.servlet-api + ${javaxVersion} + test + + + + org.apache.tomcat + jasper + ${apacheTomcatVersion} + provided + + + + + + + + org.jacoco + jacoco-maven-plugin + + + com.mycila + license-maven-plugin + +
${project.parent.basedir}/license-header.txt
+ + + + + diff --git a/omod-2.5/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_5/DiagnosisResource2_5.java b/omod-2.5/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_5/DiagnosisResource2_5.java new file mode 100644 index 000000000..2e7a2a7a8 --- /dev/null +++ b/omod-2.5/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_5/DiagnosisResource2_5.java @@ -0,0 +1,89 @@ +/** + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under + * the terms of the Healthcare Disclaimer located at http://openmrs.org/license. + * + * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS + * graphic logo is a trademark of OpenMRS Inc. + */ +package org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs2_5; + +import io.swagger.models.Model; +import io.swagger.models.ModelImpl; +import io.swagger.models.properties.BooleanProperty; +import io.swagger.models.properties.IntegerProperty; +import io.swagger.models.properties.StringProperty; +import org.openmrs.Diagnosis; +import org.openmrs.module.webservices.rest.web.RestConstants; +import org.openmrs.module.webservices.rest.web.annotation.Resource; +import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation; +import org.openmrs.module.webservices.rest.web.representation.FullRepresentation; +import org.openmrs.module.webservices.rest.web.representation.Representation; +import org.openmrs.module.webservices.rest.web.resource.impl.BaseDelegatingResource; +import org.openmrs.module.webservices.rest.web.resource.impl.DelegatingCrudResource; +import org.openmrs.module.webservices.rest.web.resource.impl.DelegatingResourceDescription; +import org.openmrs.module.webservices.rest.web.response.ResourceDoesNotSupportOperationException; +import org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs2_2.DiagnosisResource2_2; + +/** + * {@link Resource} for Diagnosis, supporting standard CRUD operations + */ +@Resource(name = RestConstants.VERSION_1 + "/patientdiagnoses", order = 1, supportedClass = Diagnosis.class, supportedOpenmrsVersions = { + "2.5.* - 9.*" }) +public class DiagnosisResource2_5 extends DiagnosisResource2_2 { + + /** + * @see DelegatingCrudResource#getRepresentationDescription(Representation) + */ + @Override + public DelegatingResourceDescription getRepresentationDescription(Representation rep) { + DelegatingResourceDescription description = super.getRepresentationDescription(rep); + if (description != null) { + description.addProperty("formNamespaceAndPath"); + } + return description; + } + + /** + * @see BaseDelegatingResource#getCreatableProperties() + */ + @Override + public DelegatingResourceDescription getCreatableProperties() { + DelegatingResourceDescription description = super.getCreatableProperties(); + description.addProperty("formNamespaceAndPath"); + return description; + } + + /** + * @see BaseDelegatingResource#getUpdatableProperties() + */ + @Override + public DelegatingResourceDescription getUpdatableProperties() throws ResourceDoesNotSupportOperationException { + DelegatingResourceDescription description = super.getUpdatableProperties(); + description.addProperty("formNamespaceAndPath"); + return description; + } + + @Override + public Model getGETModel(Representation rep) { + return addNewProperties(super.getGETModel(rep), rep); + } + + @Override + public Model getCREATEModel(Representation rep) { + return addNewProperties(super.getCREATEModel(rep), rep); + } + + @Override + public Model getUPDATEModel(Representation rep) { + return addNewProperties(super.getUPDATEModel(rep), rep); + } + + private Model addNewProperties(Model model, Representation rep) { + if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) { + ((ModelImpl) model).property("formNamespaceAndPath", new StringProperty()); + } + return model; + } +} \ No newline at end of file diff --git a/omod-2.5/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_5/DiagnosisResource2_5Test.java b/omod-2.5/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_5/DiagnosisResource2_5Test.java new file mode 100644 index 000000000..5a4b95193 --- /dev/null +++ b/omod-2.5/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_5/DiagnosisResource2_5Test.java @@ -0,0 +1,93 @@ +/** + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under + * the terms of the Healthcare Disclaimer located at http://openmrs.org/license. + * + * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS + * graphic logo is a trademark of OpenMRS Inc. + */ +package org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs2_5; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.openmrs.Diagnosis; +import org.openmrs.api.DiagnosisService; +import org.openmrs.api.EncounterService; +import org.openmrs.api.PatientService; +import org.openmrs.api.context.Context; +import org.openmrs.module.webservices.rest.web.resource.impl.BaseDelegatingResourceTest; +import org.openmrs.module.webservices.rest.web.v1_0.RestTestConstants2_2; + +/** + * Tests functionality of {@link DiagnosisResource2_5}. + */ +public class DiagnosisResource2_5Test extends BaseDelegatingResourceTest { + + + private DiagnosisService diagnosisService; + + private EncounterService encounterService; + + private PatientService patientService; + + + @Before + public void before() { + this.diagnosisService = Context.getDiagnosisService(); + this.encounterService = Context.getEncounterService(); + this.patientService = Context.getPatientService(); + executeDataSet("DiagnosisResourceTestDataset.xml"); + } + + @Override + public Diagnosis newObject() { + return diagnosisService.getDiagnosisByUuid(getUuidProperty()); + } + + @Override + public String getUuidProperty() { + return RestTestConstants2_2.DIAGNOSIS_UUID; + } + + @Override + public void validateDefaultRepresentation() throws Exception { + super.validateDefaultRepresentation(); + assertPropEquals("formNamespaceAndPath", getObject().getFormNamespaceAndPath()); + } + + @Override + public void validateFullRepresentation() throws Exception { + super.validateFullRepresentation(); + assertPropEquals("formNamespaceAndPath", getObject().getFormNamespaceAndPath()); + } + + @Override + public String getDisplayProperty() { + return ""; + } + + @Test + public void testFormFieldNamespace() { + String uuid = "a303bbfb-w5w4-25d1-9f11-4f33f99d456r"; + Diagnosis diagnosis = new Diagnosis(); + diagnosis.setUuid(uuid); + diagnosis.setEncounter(encounterService.getEncounter(1)); + diagnosis.setPatient(patientService.getPatient(1)); + diagnosis.setRank(2); + + final String NAMESPACE = "namespace"; + final String FORMFIELD_PATH = "formFieldPath"; + diagnosis.setFormField(NAMESPACE, FORMFIELD_PATH); + diagnosisService.save(diagnosis); + + Diagnosis savedDiagnosis = diagnosisService.getDiagnosisByUuid(uuid); + String formFieldNameSpace = savedDiagnosis.getFormFieldNamespace(); + String formFieldPath = savedDiagnosis.getFormFieldPath(); + + Assert.assertEquals("namespace", formFieldNameSpace); + Assert.assertEquals("formFieldPath", formFieldPath); + Assert.assertNotNull(savedDiagnosis.getFormNamespaceAndPath()); + } +} \ No newline at end of file diff --git a/omod-2.5/src/test/resources/DiagnosisResourceTestDataset.xml b/omod-2.5/src/test/resources/DiagnosisResourceTestDataset.xml new file mode 100644 index 000000000..ca779465b --- /dev/null +++ b/omod-2.5/src/test/resources/DiagnosisResourceTestDataset.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/omod/pom.xml b/omod/pom.xml index e0cd4bfff..e2a42d1bc 100644 --- a/omod/pom.xml +++ b/omod/pom.xml @@ -143,6 +143,18 @@ tests test + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-2.5 + ${project.parent.version} + + + ${project.parent.groupId} + ${project.parent.artifactId}-omod-2.5 + ${project.parent.version} + tests + test + diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml index 0b2d6222f..2b0fc0cc7 100644 --- a/omod/src/main/resources/config.xml +++ b/omod/src/main/resources/config.xml @@ -50,6 +50,10 @@ /lib/webservices.rest-omod-2.4.* 2.4.* - 9.* + + /lib/webservices.rest-omod-2.5.* + 2.5.* - 9.* + diff --git a/pom.xml b/pom.xml index 76649b8e4..cd1c9c437 100644 --- a/pom.xml +++ b/pom.xml @@ -428,6 +428,7 @@ omod-2.2 omod-2.3 omod-2.4 + omod-2.5 omod integration-tests @@ -501,6 +502,7 @@ omod-2.2 omod-2.3 omod-2.4 + omod-2.5 omod integration-tests