diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 908e1ca5..b1cf3744 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: platform: [ ubuntu-latest ] - java-version: [ 8, 11, 17, 21, 24 ] + java-version: [21, 24 ] runs-on: ${{ matrix.platform }} env: diff --git a/omod/pom.xml b/omod/pom.xml index 12cd729b..344a1084 100755 --- a/omod/pom.xml +++ b/omod/pom.xml @@ -51,6 +51,12 @@ org.openmrs.api openmrs-api jar + + + org.codehaus.groovy + groovy-all + + @@ -111,25 +117,14 @@ org.openmrs.contrib dwr - 2.0.8-mod-SNAPSHOT + 3.0.0-SNAPSHOT - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - jfree jfreechart - - javax.servlet - jsp-api - org.mockito @@ -137,7 +132,12 @@ test - + + org.apache.commons + commons-fileupload2-jakarta + 2.0.0-M1 + provided + diff --git a/omod/src/main/java/org/openmrs/hl7/web/HL7InQueueProcessorServlet.java b/omod/src/main/java/org/openmrs/hl7/web/HL7InQueueProcessorServlet.java index c3c8fb59..4160ca68 100644 --- a/omod/src/main/java/org/openmrs/hl7/web/HL7InQueueProcessorServlet.java +++ b/omod/src/main/java/org/openmrs/hl7/web/HL7InQueueProcessorServlet.java @@ -11,12 +11,12 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.openmrs.api.context.Context; import org.openmrs.hl7.HL7InQueueProcessor; diff --git a/omod/src/main/java/org/openmrs/module/web/controller/ModuleListController.java b/omod/src/main/java/org/openmrs/module/web/controller/ModuleListController.java index db9d8387..f522f074 100644 --- a/omod/src/main/java/org/openmrs/module/web/controller/ModuleListController.java +++ b/omod/src/main/java/org/openmrs/module/web/controller/ModuleListController.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/module/web/controller/ModuleManagementController.java b/omod/src/main/java/org/openmrs/module/web/controller/ModuleManagementController.java index c45649fb..afefca88 100644 --- a/omod/src/main/java/org/openmrs/module/web/controller/ModuleManagementController.java +++ b/omod/src/main/java/org/openmrs/module/web/controller/ModuleManagementController.java @@ -12,8 +12,8 @@ import java.io.IOException; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/module/web/controller/ModulePropertiesFormController.java b/omod/src/main/java/org/openmrs/module/web/controller/ModulePropertiesFormController.java index 79303024..76671956 100644 --- a/omod/src/main/java/org/openmrs/module/web/controller/ModulePropertiesFormController.java +++ b/omod/src/main/java/org/openmrs/module/web/controller/ModulePropertiesFormController.java @@ -12,10 +12,10 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/module/web/filter/AdminPageFilter.java b/omod/src/main/java/org/openmrs/module/web/filter/AdminPageFilter.java index 8beec6ae..35dced76 100644 --- a/omod/src/main/java/org/openmrs/module/web/filter/AdminPageFilter.java +++ b/omod/src/main/java/org/openmrs/module/web/filter/AdminPageFilter.java @@ -11,12 +11,12 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; public class AdminPageFilter implements Filter { diff --git a/omod/src/main/java/org/openmrs/module/web/filter/ForcePasswordChangeFilter.java b/omod/src/main/java/org/openmrs/module/web/filter/ForcePasswordChangeFilter.java index 21d1d828..241315f3 100644 --- a/omod/src/main/java/org/openmrs/module/web/filter/ForcePasswordChangeFilter.java +++ b/omod/src/main/java/org/openmrs/module/web/filter/ForcePasswordChangeFilter.java @@ -11,14 +11,14 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.openmrs.api.context.Context; import org.openmrs.web.user.UserProperties; diff --git a/omod/src/main/java/org/openmrs/module/web/filter/RedirectAfterLoginFilter.java b/omod/src/main/java/org/openmrs/module/web/filter/RedirectAfterLoginFilter.java index 7bcfc27b..9d8298a5 100644 --- a/omod/src/main/java/org/openmrs/module/web/filter/RedirectAfterLoginFilter.java +++ b/omod/src/main/java/org/openmrs/module/web/filter/RedirectAfterLoginFilter.java @@ -11,14 +11,14 @@ import static org.openmrs.web.WebConstants.OPENMRS_LOGIN_REDIRECT_HTTPSESSION_ATTR; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import org.apache.commons.lang.StringUtils; diff --git a/omod/src/main/java/org/openmrs/module/web/taglib/ExtensionPointTag.java b/omod/src/main/java/org/openmrs/module/web/taglib/ExtensionPointTag.java index 72e178a7..f5eabaaf 100644 --- a/omod/src/main/java/org/openmrs/module/web/taglib/ExtensionPointTag.java +++ b/omod/src/main/java/org/openmrs/module/web/taglib/ExtensionPointTag.java @@ -16,11 +16,11 @@ import java.util.List; import java.util.Map; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspTagException; -import javax.servlet.jsp.tagext.BodyContent; -import javax.servlet.jsp.tagext.BodyTag; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspTagException; +import jakarta.servlet.jsp.tagext.BodyContent; +import jakarta.servlet.jsp.tagext.BodyTag; +import jakarta.servlet.jsp.tagext.TagSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -153,7 +153,7 @@ public int doStartTag() { } /** - * @see javax.servlet.jsp.tagext.BodyTag#doInitBody() + * @see jakarta.servlet.jsp.tagext.BodyTag#doInitBody() */ public void doInitBody() throws JspException { getBodyContent().clearBody(); @@ -164,7 +164,7 @@ public void doInitBody() throws JspException { } /** - * @see javax.servlet.jsp.tagext.IterationTag#doAfterBody() + * @see jakarta.servlet.jsp.tagext.IterationTag#doAfterBody() */ public int doAfterBody() throws JspException { if (extensions.hasNext()) { @@ -205,7 +205,7 @@ private void iterate() { } /** - * @see javax.servlet.jsp.tagext.Tag#doEndTag() + * @see jakarta.servlet.jsp.tagext.Tag#doEndTag() */ public int doEndTag() throws JspException { try { diff --git a/omod/src/main/java/org/openmrs/module/web/taglib/ExtensionPopupMenuTag.java b/omod/src/main/java/org/openmrs/module/web/taglib/ExtensionPopupMenuTag.java index fee4b2c3..3f8cda40 100644 --- a/omod/src/main/java/org/openmrs/module/web/taglib/ExtensionPopupMenuTag.java +++ b/omod/src/main/java/org/openmrs/module/web/taglib/ExtensionPopupMenuTag.java @@ -15,9 +15,9 @@ import java.util.Random; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/notification/web/ForEachAlertTag.java b/omod/src/main/java/org/openmrs/notification/web/ForEachAlertTag.java index 0b7b5ace..4697f42d 100644 --- a/omod/src/main/java/org/openmrs/notification/web/ForEachAlertTag.java +++ b/omod/src/main/java/org/openmrs/notification/web/ForEachAlertTag.java @@ -12,8 +12,8 @@ import java.util.Iterator; import java.util.List; -import javax.servlet.jsp.JspTagException; -import javax.servlet.jsp.jstl.core.LoopTagSupport; +import jakarta.servlet.jsp.JspTagException; +import jakarta.servlet.jsp.jstl.core.LoopTagSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/notification/web/controller/AlertFormController.java b/omod/src/main/java/org/openmrs/notification/web/controller/AlertFormController.java index d89fdc69..7b6309f5 100644 --- a/omod/src/main/java/org/openmrs/notification/web/controller/AlertFormController.java +++ b/omod/src/main/java/org/openmrs/notification/web/controller/AlertFormController.java @@ -16,9 +16,9 @@ import java.util.Map; import java.util.Vector; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/notification/web/controller/AlertListController.java b/omod/src/main/java/org/openmrs/notification/web/controller/AlertListController.java index ea9e9936..688a8142 100644 --- a/omod/src/main/java/org/openmrs/notification/web/controller/AlertListController.java +++ b/omod/src/main/java/org/openmrs/notification/web/controller/AlertListController.java @@ -16,9 +16,9 @@ import java.util.Map; import java.util.Vector; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/notification/web/dwr/DWRMessageService.java b/omod/src/main/java/org/openmrs/notification/web/dwr/DWRMessageService.java index 3e8a8328..3a67393c 100644 --- a/omod/src/main/java/org/openmrs/notification/web/dwr/DWRMessageService.java +++ b/omod/src/main/java/org/openmrs/notification/web/dwr/DWRMessageService.java @@ -11,7 +11,7 @@ import java.util.Vector; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; diff --git a/omod/src/main/java/org/openmrs/scheduler/web/controller/SchedulerFormController.java b/omod/src/main/java/org/openmrs/scheduler/web/controller/SchedulerFormController.java index 065bea00..104e8704 100644 --- a/omod/src/main/java/org/openmrs/scheduler/web/controller/SchedulerFormController.java +++ b/omod/src/main/java/org/openmrs/scheduler/web/controller/SchedulerFormController.java @@ -15,10 +15,10 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -29,6 +29,7 @@ import org.openmrs.web.WebUtil; import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.beans.propertyeditors.CustomNumberEditor; +import org.springframework.context.support.MessageSourceAccessor; import org.springframework.validation.BindException; import org.springframework.validation.Errors; import org.springframework.web.bind.ServletRequestDataBinder; @@ -147,7 +148,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse view = getSuccessView(); Object[] args = new Object[] { WebUtil.escapeHTML(task.getName()) }; - String success = getMessageSourceAccessor().getMessage("Scheduler.taskForm.saved", args); + String success = new MessageSourceAccessor(Context.getMessageSourceService()).getMessage("Scheduler.taskForm.saved", args); httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, success); return new ModelAndView(new RedirectView(view)); diff --git a/omod/src/main/java/org/openmrs/scheduler/web/controller/SchedulerListController.java b/omod/src/main/java/org/openmrs/scheduler/web/controller/SchedulerListController.java index 6a4385a0..fcac693b 100644 --- a/omod/src/main/java/org/openmrs/scheduler/web/controller/SchedulerListController.java +++ b/omod/src/main/java/org/openmrs/scheduler/web/controller/SchedulerListController.java @@ -13,10 +13,10 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/CopyLegacyUiContentToWebInf.java b/omod/src/main/java/org/openmrs/web/CopyLegacyUiContentToWebInf.java index 2ab5be0b..af6e93f2 100644 --- a/omod/src/main/java/org/openmrs/web/CopyLegacyUiContentToWebInf.java +++ b/omod/src/main/java/org/openmrs/web/CopyLegacyUiContentToWebInf.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.List; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; diff --git a/omod/src/main/java/org/openmrs/web/LegacyUIJavaConfig.java b/omod/src/main/java/org/openmrs/web/LegacyUIJavaConfig.java new file mode 100644 index 00000000..f67e3de1 --- /dev/null +++ b/omod/src/main/java/org/openmrs/web/LegacyUIJavaConfig.java @@ -0,0 +1,41 @@ +/** + * 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.web; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class LegacyUIJavaConfig implements WebMvcConfigurer { + + @Override + public void addInterceptors(InterceptorRegistry registry) { + var localeChangeInterceptor = new org.springframework.web.servlet.i18n.LocaleChangeInterceptor(); + localeChangeInterceptor.setParamName("lang"); + registry.addInterceptor(localeChangeInterceptor); + + var themeChangeInterceptor = new org.springframework.web.servlet.theme.ThemeChangeInterceptor(); + themeChangeInterceptor.setParamName("theme"); + registry.addInterceptor(themeChangeInterceptor); + } + + @Override + public void addViewControllers(ViewControllerRegistry registry) { + registry.addViewController("findPatient.htm").setViewName("module/legacyui/findPatient"); + registry.addViewController("admin/index.htm").setViewName("module/legacyui/admin/index"); + registry.addViewController("dictionary/index.htm").setViewName("module/legacyui/dictionary/index"); + registry.addViewController("patients/index.htm").setViewName("module/legacyui/admin/patients/index"); + registry.addViewController("encounters/index.htm").setViewName("module/legacyui/admin/encounters/index"); + registry.addViewController("observations/index.htm").setViewName("module/legacyui/admin/observations/index"); + registry.addViewController("help.htm").setViewName("module/legacyui/help"); + } +} diff --git a/omod/src/main/java/org/openmrs/web/OpenmrsCookieLocaleResolver.java b/omod/src/main/java/org/openmrs/web/OpenmrsCookieLocaleResolver.java index d50862b3..b2828da6 100644 --- a/omod/src/main/java/org/openmrs/web/OpenmrsCookieLocaleResolver.java +++ b/omod/src/main/java/org/openmrs/web/OpenmrsCookieLocaleResolver.java @@ -11,9 +11,9 @@ import java.util.Locale; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.openmrs.api.context.Context; import org.springframework.web.servlet.i18n.CookieLocaleResolver; diff --git a/omod/src/main/java/org/openmrs/web/SessionListener.java b/omod/src/main/java/org/openmrs/web/SessionListener.java index a0368abf..9170080b 100644 --- a/omod/src/main/java/org/openmrs/web/SessionListener.java +++ b/omod/src/main/java/org/openmrs/web/SessionListener.java @@ -9,8 +9,8 @@ */ package org.openmrs.web; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/WebComponentRegistrar.java b/omod/src/main/java/org/openmrs/web/WebComponentRegistrar.java index 595f9335..5ac816d2 100644 --- a/omod/src/main/java/org/openmrs/web/WebComponentRegistrar.java +++ b/omod/src/main/java/org/openmrs/web/WebComponentRegistrar.java @@ -9,10 +9,11 @@ */ package org.openmrs.web; -import javax.servlet.DispatcherType; -import javax.servlet.FilterRegistration.Dynamic; -import javax.servlet.ServletContext; -import javax.servlet.ServletRegistration; +import jakarta.annotation.Nonnull; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.FilterRegistration.Dynamic; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRegistration; import java.util.EnumSet; import org.openmrs.contrib.dwr.servlet.EfficientShutdownServletContextAttributeListener; @@ -26,8 +27,7 @@ public class WebComponentRegistrar implements ServletContextAware { @Override - public void setServletContext(ServletContext servletContext) { - + public void setServletContext(@Nonnull ServletContext servletContext) { try { String[] mappings = { "*.htm", "*.form", "*.list", "*.json", "*.field", "*.portlet", "*.page", "*.action" }; @@ -66,9 +66,11 @@ public void setServletContext(ServletContext servletContext) { } private void addMappings(ServletRegistration reg, String... mappings) { - for (String mapping : mappings) { - reg.addMapping(mapping); - } + if (reg != null) { + for (String mapping : mappings) { + reg.addMapping(mapping); + } + } } } diff --git a/omod/src/main/java/org/openmrs/web/attribute/WebAttributeUtil.java b/omod/src/main/java/org/openmrs/web/attribute/WebAttributeUtil.java index ea7311b3..ecbf4c97 100644 --- a/omod/src/main/java/org/openmrs/web/attribute/WebAttributeUtil.java +++ b/omod/src/main/java/org/openmrs/web/attribute/WebAttributeUtil.java @@ -16,7 +16,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang.StringUtils; import org.openmrs.api.context.Context; diff --git a/omod/src/main/java/org/openmrs/web/attribute/handler/BooleanFieldGenDatatypeHandler.java b/omod/src/main/java/org/openmrs/web/attribute/handler/BooleanFieldGenDatatypeHandler.java index 3918c798..f3c6eaf8 100644 --- a/omod/src/main/java/org/openmrs/web/attribute/handler/BooleanFieldGenDatatypeHandler.java +++ b/omod/src/main/java/org/openmrs/web/attribute/handler/BooleanFieldGenDatatypeHandler.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang.StringUtils; import org.openmrs.api.context.Context; diff --git a/omod/src/main/java/org/openmrs/web/attribute/handler/DateFieldGenDatatypeHandler.java b/omod/src/main/java/org/openmrs/web/attribute/handler/DateFieldGenDatatypeHandler.java index 9fdd44b8..2238b088 100644 --- a/omod/src/main/java/org/openmrs/web/attribute/handler/DateFieldGenDatatypeHandler.java +++ b/omod/src/main/java/org/openmrs/web/attribute/handler/DateFieldGenDatatypeHandler.java @@ -13,7 +13,7 @@ import java.util.Date; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang.StringUtils; import org.openmrs.api.context.Context; diff --git a/omod/src/main/java/org/openmrs/web/attribute/handler/FieldGenDatatypeHandler.java b/omod/src/main/java/org/openmrs/web/attribute/handler/FieldGenDatatypeHandler.java index cc0fa446..a8e7d9ba 100644 --- a/omod/src/main/java/org/openmrs/web/attribute/handler/FieldGenDatatypeHandler.java +++ b/omod/src/main/java/org/openmrs/web/attribute/handler/FieldGenDatatypeHandler.java @@ -11,7 +11,7 @@ import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.openmrs.customdatatype.CustomDatatype; import org.openmrs.customdatatype.CustomDatatypeHandler; diff --git a/omod/src/main/java/org/openmrs/web/attribute/handler/LongFreeTextFileUploadHandler.java b/omod/src/main/java/org/openmrs/web/attribute/handler/LongFreeTextFileUploadHandler.java index 668f98fc..67612660 100644 --- a/omod/src/main/java/org/openmrs/web/attribute/handler/LongFreeTextFileUploadHandler.java +++ b/omod/src/main/java/org/openmrs/web/attribute/handler/LongFreeTextFileUploadHandler.java @@ -12,7 +12,7 @@ import java.io.IOException; import java.io.OutputStream; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.openmrs.customdatatype.CustomDatatype; import org.openmrs.customdatatype.DownloadableDatatypeHandler; diff --git a/omod/src/main/java/org/openmrs/web/attribute/handler/LongFreeTextTextareaHandler.java b/omod/src/main/java/org/openmrs/web/attribute/handler/LongFreeTextTextareaHandler.java index 63696b65..e0c3d047 100644 --- a/omod/src/main/java/org/openmrs/web/attribute/handler/LongFreeTextTextareaHandler.java +++ b/omod/src/main/java/org/openmrs/web/attribute/handler/LongFreeTextTextareaHandler.java @@ -13,7 +13,7 @@ import java.io.OutputStream; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.openmrs.customdatatype.CustomDatatype; import org.openmrs.customdatatype.CustomDatatypeUtil; diff --git a/omod/src/main/java/org/openmrs/web/attribute/handler/RegexValidatedTextDatatypeHandler.java b/omod/src/main/java/org/openmrs/web/attribute/handler/RegexValidatedTextDatatypeHandler.java index 104b9f03..cbee80f2 100644 --- a/omod/src/main/java/org/openmrs/web/attribute/handler/RegexValidatedTextDatatypeHandler.java +++ b/omod/src/main/java/org/openmrs/web/attribute/handler/RegexValidatedTextDatatypeHandler.java @@ -11,7 +11,7 @@ import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/attribute/handler/SerializingFieldGenDatatypeHandler.java b/omod/src/main/java/org/openmrs/web/attribute/handler/SerializingFieldGenDatatypeHandler.java index a14cfdcf..6535e032 100644 --- a/omod/src/main/java/org/openmrs/web/attribute/handler/SerializingFieldGenDatatypeHandler.java +++ b/omod/src/main/java/org/openmrs/web/attribute/handler/SerializingFieldGenDatatypeHandler.java @@ -9,7 +9,7 @@ */ package org.openmrs.web.attribute.handler; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.beans.PropertyEditor; diff --git a/omod/src/main/java/org/openmrs/web/attribute/handler/SpecifiedTextOptionsDropdownHandler.java b/omod/src/main/java/org/openmrs/web/attribute/handler/SpecifiedTextOptionsDropdownHandler.java index 29ead5cb..395b0d58 100644 --- a/omod/src/main/java/org/openmrs/web/attribute/handler/SpecifiedTextOptionsDropdownHandler.java +++ b/omod/src/main/java/org/openmrs/web/attribute/handler/SpecifiedTextOptionsDropdownHandler.java @@ -14,7 +14,7 @@ import org.openmrs.customdatatype.datatype.SpecifiedTextOptionsDatatype; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; diff --git a/omod/src/main/java/org/openmrs/web/attribute/handler/WebDatatypeHandler.java b/omod/src/main/java/org/openmrs/web/attribute/handler/WebDatatypeHandler.java index e3b3c6e6..01034e9e 100644 --- a/omod/src/main/java/org/openmrs/web/attribute/handler/WebDatatypeHandler.java +++ b/omod/src/main/java/org/openmrs/web/attribute/handler/WebDatatypeHandler.java @@ -9,7 +9,7 @@ */ package org.openmrs.web.attribute.handler; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.openmrs.customdatatype.CustomDatatype; import org.openmrs.customdatatype.CustomDatatypeHandler; diff --git a/omod/src/main/java/org/openmrs/web/controller/ConceptFormController.java b/omod/src/main/java/org/openmrs/web/controller/ConceptFormController.java index 93abe55e..0dbcf7e8 100644 --- a/omod/src/main/java/org/openmrs/web/controller/ConceptFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/ConceptFormController.java @@ -26,10 +26,10 @@ import java.util.Objects; import java.util.Set; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.collections.FactoryUtils; import org.apache.commons.collections.ListUtils; @@ -38,6 +38,7 @@ import org.openmrs.Concept; import org.openmrs.ConceptAnswer; import org.openmrs.ConceptAttribute; +import org.openmrs.ConceptAttributeType; import org.openmrs.ConceptComplex; import org.openmrs.ConceptDescription; import org.openmrs.ConceptMap; @@ -81,6 +82,7 @@ import org.springframework.beans.propertyeditors.CustomNumberEditor; import org.springframework.context.support.MessageSourceAccessor; import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import org.springframework.validation.BindException; import org.springframework.validation.Errors; @@ -139,7 +141,7 @@ protected void initBinder(HttpServletRequest request, ServletRequestDataBinder b protected ModelAndView processFormSubmission(HttpServletRequest request, HttpServletResponse response, Object object, BindException errors) throws Exception { - if (getMessageSourceAccessor().getMessage("Concept.cancel").equals(request.getParameter("action"))) { + if (Context.getMessageSourceService().getMessage("Concept.cancel").equals(request.getParameter("action"))) { return new ModelAndView(new RedirectView("index.htm")); } @@ -192,9 +194,8 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse ConceptService cs = Context.getConceptService(); if (Context.isAuthenticated()) { - ConceptFormBackingObject conceptBackingObject = (ConceptFormBackingObject) obj; - MessageSourceAccessor msa = getMessageSourceAccessor(); + MessageSourceAccessor msa = new MessageSourceAccessor(Context.getMessageSourceService()); String action = request.getParameter("action"); if (action.equals(msa.getMessage("general.retire"))) { @@ -261,6 +262,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse return new ModelAndView(new RedirectView(getSuccessView() + "?conceptId=" + concept.getConceptId())); } else { Concept concept = conceptBackingObject.getConceptFromFormData(); + List conceptAttributeTypes = cs.getAllConceptAttributeTypes(); //if the user is editing a concept, initialise the associated creator property //this is aimed at avoiding a lazy initialisation exception when rendering //the jsp after validation has failed @@ -270,7 +272,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse try { WebAttributeUtil.handleSubmittedAttributesForType(conceptBackingObject.getConcept(), errors, - ConceptAttribute.class, request, cs.getAllConceptAttributeTypes()); + ConceptAttribute.class, request, conceptAttributeTypes); errors.pushNestedPath("concept"); ValidateUtil.validate(concept, errors); @@ -397,10 +399,13 @@ protected Map referenceData(HttpServletRequest request) throws E if (Context.hasPrivilege(PrivilegeConstants.GET_OBS)) { try { Concept concept = cs.getConcept(Integer.valueOf(conceptId)); - dataTypeReadOnly = cs.hasAnyObservation(concept); - if (concept != null && concept.getDatatype().isBoolean()) { - map.put("isBoolean", true); - } + if (concept != null) { + if (concept.getDatatype().isBoolean()) { + map.put("isBoolean", true); + } + + dataTypeReadOnly = cs.hasAnyObservation(concept); + } } catch (NumberFormatException ex) { // nothing to do diff --git a/omod/src/main/java/org/openmrs/web/controller/ConceptStatsFormController.java b/omod/src/main/java/org/openmrs/web/controller/ConceptStatsFormController.java index 35c6e8b6..d77132f0 100644 --- a/omod/src/main/java/org/openmrs/web/controller/ConceptStatsFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/ConceptStatsFormController.java @@ -18,9 +18,9 @@ import java.util.Map; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/FieldGenController.java b/omod/src/main/java/org/openmrs/web/controller/FieldGenController.java index 0a0a4709..ff0243e6 100644 --- a/omod/src/main/java/org/openmrs/web/controller/FieldGenController.java +++ b/omod/src/main/java/org/openmrs/web/controller/FieldGenController.java @@ -13,9 +13,9 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -32,9 +32,9 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons IOException { // find the field that was identified in the openmrs:fieldGen taglib - Object uri = request.getAttribute("javax.servlet.include.servlet_path.fieldGen"); + Object uri = request.getAttribute("jakarta.servlet.include.servlet_path.fieldGen"); if (uri == null) { - uri = request.getAttribute("javax.servlet.include.servlet_path"); + uri = request.getAttribute("jakarta.servlet.include.servlet_path"); } String fieldGenPath = ""; Map model = new HashMap(); diff --git a/omod/src/main/java/org/openmrs/web/controller/ForgotPasswordFormController.java b/omod/src/main/java/org/openmrs/web/controller/ForgotPasswordFormController.java index 03c77007..3fe6471d 100644 --- a/omod/src/main/java/org/openmrs/web/controller/ForgotPasswordFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/ForgotPasswordFormController.java @@ -15,10 +15,10 @@ import java.util.List; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; diff --git a/omod/src/main/java/org/openmrs/web/controller/GlobalPropertyPortletController.java b/omod/src/main/java/org/openmrs/web/controller/GlobalPropertyPortletController.java index d3ef8215..0607458c 100644 --- a/omod/src/main/java/org/openmrs/web/controller/GlobalPropertyPortletController.java +++ b/omod/src/main/java/org/openmrs/web/controller/GlobalPropertyPortletController.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.openmrs.GlobalProperty; import org.openmrs.api.context.Context; diff --git a/omod/src/main/java/org/openmrs/web/controller/LegacyCatchAllController.java b/omod/src/main/java/org/openmrs/web/controller/LegacyCatchAllController.java new file mode 100644 index 00000000..b07ca0aa --- /dev/null +++ b/omod/src/main/java/org/openmrs/web/controller/LegacyCatchAllController.java @@ -0,0 +1,145 @@ +package org.openmrs.web.controller; + + + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.Controller; + +@org.springframework.stereotype.Controller +@RequestMapping("/**") // handled via PathPattern with /** mapping in XML +public class LegacyCatchAllController implements Controller { + + @Autowired + private Controller springController; + @Autowired + private Controller fieldGenController; + @Autowired + private Controller portletController; + + @Autowired + private Controller globalPropertyPortletController; + + @Autowired + private Controller addressLayoutPortletController; + + @Autowired + private Controller nameLayoutPortletController; + + @Autowired + private Controller patientProgramsPortletController; + + @Autowired + private Controller personRelationshipsPortletController; + + @Autowired + private Controller patientEncountersPortletController; + + @Autowired + private Controller patientVisitsPortletController; + + @Autowired + private Controller personFormEntryPortletController; + + public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception { + String path = request.getRequestURI(); + if (path == null) { + response.sendError(HttpServletResponse.SC_NOT_FOUND); + return null; + } + + // Normalize (strip context path if present) + String ctx = request.getContextPath(); + if (ctx != null && !ctx.isEmpty() && path.startsWith(ctx)) { + path = path.substring(ctx.length()); + } + + if (path.endsWith("/globalProperties.portlet")) { + return globalPropertyPortletController.handleRequest(request, response); + } + if (path.endsWith("/addressLayout.portlet")) { + return addressLayoutPortletController.handleRequest(request, response); + } + if (path.endsWith("/nameLayout.portlet")) { + return nameLayoutPortletController.handleRequest(request, response); + } + if (path.endsWith("/patientPrograms.portlet")) { + return patientProgramsPortletController.handleRequest(request, response); + } + if (path.endsWith("/personRelationships.portlet")) { + return personRelationshipsPortletController.handleRequest(request, response); + } + if (path.endsWith("/patientEncounters.portlet")) { + return patientEncountersPortletController.handleRequest(request, response); + } + if (path.endsWith("/patientVisits.portlet")) { + return patientVisitsPortletController.handleRequest(request, response); + } + if (path.endsWith("/personFormEntry.portlet")) { + return personFormEntryPortletController.handleRequest(request, response); + } + + if (path.endsWith(".field")) { + return fieldGenController.handleRequest(request, response); + } + if (path.endsWith(".htm")) { + return springController.handleRequest(request, response); + } + if (path.endsWith(".portlet")) { + return portletController.handleRequest(request, response); + } + + // Default fallback – nothing matched + response.sendError(HttpServletResponse.SC_NOT_FOUND, "No handler found for " + path); + return null; + } + + + public void setSpringController(Controller springController) { + this.springController = springController; + } + + public void setFieldGenController(Controller fieldGenController) { + this.fieldGenController = fieldGenController; + } + + public void setPortletController(Controller portletController) { + this.portletController = portletController; + } + + public void setGlobalPropertyPortletController(Controller globalPropertyPortletController) { + this.globalPropertyPortletController = globalPropertyPortletController; + } + + public void setAddressLayoutPortletController(Controller addressLayoutPortletController) { + this.addressLayoutPortletController = addressLayoutPortletController; + } + + public void setNameLayoutPortletController(Controller nameLayoutPortletController) { + this.nameLayoutPortletController = nameLayoutPortletController; + } + + public void setPatientProgramsPortletController(Controller patientProgramsPortletController) { + this.patientProgramsPortletController = patientProgramsPortletController; + } + + public void setPersonRelationshipsPortletController(Controller personRelationshipsPortletController) { + this.personRelationshipsPortletController = personRelationshipsPortletController; + } + + public void setPatientEncountersPortletController(Controller patientEncountersPortletController) { + this.patientEncountersPortletController = patientEncountersPortletController; + } + + public void setPatientVisitsPortletController(Controller patientVisitsPortletController) { + this.patientVisitsPortletController = patientVisitsPortletController; + } + + public void setPersonFormEntryPortletController(Controller personFormEntryPortletController) { + this.personFormEntryPortletController = personFormEntryPortletController; + } +} + diff --git a/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java b/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java index 4cd82527..48d6b5f3 100644 --- a/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java @@ -16,10 +16,10 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -378,7 +378,7 @@ protected Map referenceData(HttpServletRequest request) throws E //ignore } - hints.add(mss.getMessage("options.login.password.minCharacterCount", new Object[] { minChar }, null)); + hints.add(mss.getMessage("options.login.password.minCharacterCount", new Object[] { minChar }, Context.getLocale())); addHint(hints, as.getGlobalProperty(OpenmrsConstants.GP_PASSWORD_CANNOT_MATCH_USERNAME_OR_SYSTEMID), mss.getMessage("options.login.password.cannotMatchUsername")); addHint(hints, as.getGlobalProperty(OpenmrsConstants.GP_PASSWORD_REQUIRES_UPPER_AND_LOWER_CASE), diff --git a/omod/src/main/java/org/openmrs/web/controller/PatientEncountersPortletController.java b/omod/src/main/java/org/openmrs/web/controller/PatientEncountersPortletController.java index 9eb986a2..7abec7c6 100644 --- a/omod/src/main/java/org/openmrs/web/controller/PatientEncountersPortletController.java +++ b/omod/src/main/java/org/openmrs/web/controller/PatientEncountersPortletController.java @@ -11,7 +11,7 @@ import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.openmrs.api.context.Context; diff --git a/omod/src/main/java/org/openmrs/web/controller/PatientProgramsPortletController.java b/omod/src/main/java/org/openmrs/web/controller/PatientProgramsPortletController.java index ac4e6ab4..2596a27c 100644 --- a/omod/src/main/java/org/openmrs/web/controller/PatientProgramsPortletController.java +++ b/omod/src/main/java/org/openmrs/web/controller/PatientProgramsPortletController.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.openmrs.Location; import org.openmrs.Program; diff --git a/omod/src/main/java/org/openmrs/web/controller/PatientVisitsPortletController.java b/omod/src/main/java/org/openmrs/web/controller/PatientVisitsPortletController.java index b12ed269..1ebcc25a 100644 --- a/omod/src/main/java/org/openmrs/web/controller/PatientVisitsPortletController.java +++ b/omod/src/main/java/org/openmrs/web/controller/PatientVisitsPortletController.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/PersonFormEntryPortletController.java b/omod/src/main/java/org/openmrs/web/controller/PersonFormEntryPortletController.java index 3937bf76..1ce760b4 100644 --- a/omod/src/main/java/org/openmrs/web/controller/PersonFormEntryPortletController.java +++ b/omod/src/main/java/org/openmrs/web/controller/PersonFormEntryPortletController.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.TreeMap; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.openmrs.Form; import org.openmrs.Person; diff --git a/omod/src/main/java/org/openmrs/web/controller/PersonRelationshipsPortletController.java b/omod/src/main/java/org/openmrs/web/controller/PersonRelationshipsPortletController.java index 9b193122..49161568 100644 --- a/omod/src/main/java/org/openmrs/web/controller/PersonRelationshipsPortletController.java +++ b/omod/src/main/java/org/openmrs/web/controller/PersonRelationshipsPortletController.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.openmrs.RelationshipType; import org.openmrs.api.context.Context; diff --git a/omod/src/main/java/org/openmrs/web/controller/PortletController.java b/omod/src/main/java/org/openmrs/web/controller/PortletController.java index 959e523c..eb2b9407 100644 --- a/omod/src/main/java/org/openmrs/web/controller/PortletController.java +++ b/omod/src/main/java/org/openmrs/web/controller/PortletController.java @@ -18,10 +18,10 @@ import java.util.Map; import java.util.UUID; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -103,7 +103,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons ConceptService cs = Context.getConceptService(); // find the portlet that was identified in the openmrs:portlet taglib - Object uri = request.getAttribute("javax.servlet.include.servlet_path"); + Object uri = request.getAttribute("jakarta.servlet.include.servlet_path"); String portletPath = ""; Map model = null; { diff --git a/omod/src/main/java/org/openmrs/web/controller/RedirectController.java b/omod/src/main/java/org/openmrs/web/controller/RedirectController.java index e57562b5..770e771e 100644 --- a/omod/src/main/java/org/openmrs/web/controller/RedirectController.java +++ b/omod/src/main/java/org/openmrs/web/controller/RedirectController.java @@ -11,9 +11,9 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; diff --git a/omod/src/main/java/org/openmrs/web/controller/bean/DatatableRequest.java b/omod/src/main/java/org/openmrs/web/controller/bean/DatatableRequest.java index e4589bd1..32040984 100644 --- a/omod/src/main/java/org/openmrs/web/controller/bean/DatatableRequest.java +++ b/omod/src/main/java/org/openmrs/web/controller/bean/DatatableRequest.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.Map.Entry; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Class dedicated for DataTables. It is a request that can be extracted from diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptClassFormController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptClassFormController.java index 74bcf27b..cd1ad369 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptClassFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptClassFormController.java @@ -9,10 +9,10 @@ */ package org.openmrs.web.controller.concept; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptClassListController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptClassListController.java index cdd66cd7..bc76664f 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptClassListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptClassListController.java @@ -12,10 +12,10 @@ import java.util.List; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptDatatypeListController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptDatatypeListController.java index 6f492195..ece3fa7f 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptDatatypeListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptDatatypeListController.java @@ -12,10 +12,10 @@ import java.util.List; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptDrugFormController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptDrugFormController.java index f10f9009..9dc0a6dc 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptDrugFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptDrugFormController.java @@ -12,10 +12,10 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptDrugListController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptDrugListController.java index 952c7c64..072c5901 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptDrugListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptDrugListController.java @@ -12,8 +12,8 @@ import java.util.List; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java index 5385c5c4..5493b96e 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java @@ -19,10 +19,10 @@ import java.util.Set; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -74,7 +74,7 @@ protected ModelAndView processFormSubmission(HttpServletRequest request, HttpSer } cp.setMappedConcept(c); - MessageSourceAccessor msa = getMessageSourceAccessor(); + MessageSourceAccessor msa = new MessageSourceAccessor(Context.getMessageSourceService()); if (action.equals(msa.getMessage("general.cancel"))) { httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, "general.canceled"); return new ModelAndView(new RedirectView(getSuccessView())); @@ -121,7 +121,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse String view = getFormView(); Locale locale = Context.getLocale(); - MessageSourceAccessor msa = getMessageSourceAccessor(); + MessageSourceAccessor msa = new MessageSourceAccessor(Context.getMessageSourceService()); if (Context.isAuthenticated()) { // this concept proposal diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalListController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalListController.java index 9dc25cec..085f9bf4 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalListController.java @@ -16,8 +16,8 @@ import java.util.TreeMap; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptSourceFormController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptSourceFormController.java index 4da8024d..7b986f88 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptSourceFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptSourceFormController.java @@ -12,10 +12,10 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptSourceListController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptSourceListController.java index 6de17d46..a2ba9e00 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptSourceListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptSourceListController.java @@ -14,8 +14,8 @@ import java.util.Map; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptStopWordFormController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptStopWordFormController.java index 0727fafe..639a87d7 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptStopWordFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptStopWordFormController.java @@ -11,7 +11,7 @@ import java.util.Locale; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptStopWordListController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptStopWordListController.java index 5738700a..39ec545d 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptStopWordListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptStopWordListController.java @@ -11,7 +11,7 @@ import java.util.List; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.openmrs.ConceptStopWord; import org.openmrs.api.ConceptService; diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ProposeConceptFormController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ProposeConceptFormController.java index ce08a58f..f4539988 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ProposeConceptFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ProposeConceptFormController.java @@ -14,10 +14,10 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/customdatatype/CustomValueController.java b/omod/src/main/java/org/openmrs/web/controller/customdatatype/CustomValueController.java index d79b45fb..5131f87d 100644 --- a/omod/src/main/java/org/openmrs/web/controller/customdatatype/CustomValueController.java +++ b/omod/src/main/java/org/openmrs/web/controller/customdatatype/CustomValueController.java @@ -12,7 +12,7 @@ import java.io.IOException; import java.io.OutputStream; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -49,7 +49,7 @@ public class CustomValueController { * @return html markup * @throws IOException */ - @RequestMapping(method = RequestMethod.GET, value = "**/viewCustomValue.form") + @RequestMapping(method = RequestMethod.GET, value = "viewCustomValue.form") @ResponseBody public String viewCustomValue(@RequestParam("handler") String handlerClassname, @RequestParam(value = "datatype", required = true) String datatypeClassname, @@ -77,7 +77,7 @@ public String viewCustomValue(@RequestParam("handler") String handlerClassname, * @param valueReference * @throws IOException */ - @RequestMapping(method = RequestMethod.GET, value = "**/downloadCustomValue.form") + @RequestMapping(method = RequestMethod.GET, value = "downloadCustomValue.form") public void downloadCustomValue(HttpServletResponse response, @RequestParam("handler") String handlerClassname, @RequestParam(value = "datatype", required = true) String datatypeClassname, @RequestParam(value = "value", required = true) String valueReference) throws IOException { diff --git a/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterDisplayController.java b/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterDisplayController.java index 141cd354..e230771e 100644 --- a/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterDisplayController.java +++ b/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterDisplayController.java @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.logging.Log; diff --git a/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterFormController.java b/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterFormController.java index 845458a5..9e9a8e64 100644 --- a/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterFormController.java @@ -20,10 +20,10 @@ import java.util.TreeMap; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.logging.Log; diff --git a/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterRoleFormController.java b/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterRoleFormController.java index f4806c17..a0b9d113 100644 --- a/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterRoleFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterRoleFormController.java @@ -26,8 +26,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.ServletException; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpSession; import java.util.ArrayList; import java.util.List; diff --git a/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterTypeFormController.java b/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterTypeFormController.java index 4b2c0961..a78302f5 100644 --- a/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterTypeFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterTypeFormController.java @@ -14,10 +14,10 @@ import java.util.List; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterTypeListController.java b/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterTypeListController.java index 3ad7a8c2..88196980 100644 --- a/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterTypeListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/encounter/EncounterTypeListController.java @@ -12,8 +12,8 @@ import java.util.List; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/encounter/LocationFormController.java b/omod/src/main/java/org/openmrs/web/controller/encounter/LocationFormController.java index c5d1b8d7..0a156470 100644 --- a/omod/src/main/java/org/openmrs/web/controller/encounter/LocationFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/encounter/LocationFormController.java @@ -14,10 +14,10 @@ import java.util.List; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/encounter/LocationListController.java b/omod/src/main/java/org/openmrs/web/controller/encounter/LocationListController.java index b6b826b2..333b3ad8 100644 --- a/omod/src/main/java/org/openmrs/web/controller/encounter/LocationListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/encounter/LocationListController.java @@ -12,10 +12,10 @@ import java.util.List; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/form/AuditFieldController.java b/omod/src/main/java/org/openmrs/web/controller/form/AuditFieldController.java index 2e181a5a..00e214fd 100644 --- a/omod/src/main/java/org/openmrs/web/controller/form/AuditFieldController.java +++ b/omod/src/main/java/org/openmrs/web/controller/form/AuditFieldController.java @@ -9,9 +9,9 @@ */ package org.openmrs.web.controller.form; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/form/FieldFormController.java b/omod/src/main/java/org/openmrs/web/controller/form/FieldFormController.java index ce9d8884..4c571fb8 100644 --- a/omod/src/main/java/org/openmrs/web/controller/form/FieldFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/form/FieldFormController.java @@ -16,10 +16,10 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/form/FieldListController.java b/omod/src/main/java/org/openmrs/web/controller/form/FieldListController.java index 2c5a6859..ef1c6d99 100644 --- a/omod/src/main/java/org/openmrs/web/controller/form/FieldListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/form/FieldListController.java @@ -9,7 +9,7 @@ */ package org.openmrs.web.controller.form; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/form/FieldTypeFormController.java b/omod/src/main/java/org/openmrs/web/controller/form/FieldTypeFormController.java index 4268e229..6c95ae27 100644 --- a/omod/src/main/java/org/openmrs/web/controller/form/FieldTypeFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/form/FieldTypeFormController.java @@ -9,10 +9,10 @@ */ package org.openmrs.web.controller.form; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/form/FieldTypeListController.java b/omod/src/main/java/org/openmrs/web/controller/form/FieldTypeListController.java index 0732efd9..8abc2875 100644 --- a/omod/src/main/java/org/openmrs/web/controller/form/FieldTypeListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/form/FieldTypeListController.java @@ -23,10 +23,10 @@ import org.springframework.web.servlet.mvc.SimpleFormController; import org.springframework.web.servlet.view.RedirectView; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.util.List; import java.util.Vector; @@ -58,7 +58,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse String success = ""; String error = ""; - MessageSourceAccessor msa = getMessageSourceAccessor(); + MessageSourceAccessor msa = new MessageSourceAccessor(Context.getMessageSourceService()); String deleted = msa.getMessage("general.deleted"); String notDeleted = msa.getMessage("general.cannot.delete"); String textFieldType = msa.getMessage("FieldType.fieldType"); diff --git a/omod/src/main/java/org/openmrs/web/controller/form/FormFormController.java b/omod/src/main/java/org/openmrs/web/controller/form/FormFormController.java index 43107cde..01ba7cbf 100644 --- a/omod/src/main/java/org/openmrs/web/controller/form/FormFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/form/FormFormController.java @@ -17,10 +17,10 @@ import java.util.TreeSet; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -76,7 +76,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse if (Context.isAuthenticated()) { Form form = (Form) obj; - MessageSourceAccessor msa = getMessageSourceAccessor(); + MessageSourceAccessor msa = new MessageSourceAccessor(Context.getMessageSourceService()); String action = request.getParameter("action"); try { if (action == null) { diff --git a/omod/src/main/java/org/openmrs/web/controller/form/FormListController.java b/omod/src/main/java/org/openmrs/web/controller/form/FormListController.java index a5e67e5b..542d6ed6 100644 --- a/omod/src/main/java/org/openmrs/web/controller/form/FormListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/form/FormListController.java @@ -12,10 +12,10 @@ import java.util.List; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/form/FormResourceController.java b/omod/src/main/java/org/openmrs/web/controller/form/FormResourceController.java index 25f8aad9..4ca9e574 100644 --- a/omod/src/main/java/org/openmrs/web/controller/form/FormResourceController.java +++ b/omod/src/main/java/org/openmrs/web/controller/form/FormResourceController.java @@ -9,8 +9,8 @@ */ package org.openmrs.web.controller.form; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; diff --git a/omod/src/main/java/org/openmrs/web/controller/hl7/HL7SourceFormController.java b/omod/src/main/java/org/openmrs/web/controller/hl7/HL7SourceFormController.java index 4156f6b8..e224580d 100644 --- a/omod/src/main/java/org/openmrs/web/controller/hl7/HL7SourceFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/hl7/HL7SourceFormController.java @@ -9,10 +9,10 @@ */ package org.openmrs.web.controller.hl7; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/hl7/Hl7SourceListController.java b/omod/src/main/java/org/openmrs/web/controller/hl7/Hl7SourceListController.java index c98f9beb..c9c3a80e 100644 --- a/omod/src/main/java/org/openmrs/web/controller/hl7/Hl7SourceListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/hl7/Hl7SourceListController.java @@ -12,8 +12,8 @@ import java.util.List; import java.util.Vector; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/layout/LayoutPortletController.java b/omod/src/main/java/org/openmrs/web/controller/layout/LayoutPortletController.java index 60cb438e..12125052 100644 --- a/omod/src/main/java/org/openmrs/web/controller/layout/LayoutPortletController.java +++ b/omod/src/main/java/org/openmrs/web/controller/layout/LayoutPortletController.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/maintenance/CurrentUsersController.java b/omod/src/main/java/org/openmrs/web/controller/maintenance/CurrentUsersController.java index 8456eb20..08a9dba2 100644 --- a/omod/src/main/java/org/openmrs/web/controller/maintenance/CurrentUsersController.java +++ b/omod/src/main/java/org/openmrs/web/controller/maintenance/CurrentUsersController.java @@ -18,8 +18,8 @@ import org.openmrs.web.user.CurrentUsers; import org.springframework.web.servlet.mvc.SimpleFormController; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/omod/src/main/java/org/openmrs/web/controller/maintenance/GlobalPropertyController.java b/omod/src/main/java/org/openmrs/web/controller/maintenance/GlobalPropertyController.java index 37016c04..cfd912ce 100644 --- a/omod/src/main/java/org/openmrs/web/controller/maintenance/GlobalPropertyController.java +++ b/omod/src/main/java/org/openmrs/web/controller/maintenance/GlobalPropertyController.java @@ -14,10 +14,10 @@ import java.util.List; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -64,7 +64,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse action = "cancel"; } - if (action.equals(getMessageSourceAccessor().getMessage("general.save"))) { + if (action.equals(Context.getMessageSourceService().getMessage("general.save"))) { HttpSession httpSession = request.getSession(); if (Context.isAuthenticated()) { diff --git a/omod/src/main/java/org/openmrs/web/controller/maintenance/ImplementationIdFormController.java b/omod/src/main/java/org/openmrs/web/controller/maintenance/ImplementationIdFormController.java index 0a84beea..4755a97e 100644 --- a/omod/src/main/java/org/openmrs/web/controller/maintenance/ImplementationIdFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/maintenance/ImplementationIdFormController.java @@ -9,8 +9,8 @@ */ package org.openmrs.web.controller.maintenance; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/maintenance/QuickReportsController.java b/omod/src/main/java/org/openmrs/web/controller/maintenance/QuickReportsController.java index f71814bf..bdec0a9f 100644 --- a/omod/src/main/java/org/openmrs/web/controller/maintenance/QuickReportsController.java +++ b/omod/src/main/java/org/openmrs/web/controller/maintenance/QuickReportsController.java @@ -9,7 +9,7 @@ */ package org.openmrs.web.controller.maintenance; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/maintenance/ServerLogController.java b/omod/src/main/java/org/openmrs/web/controller/maintenance/ServerLogController.java index 6ab5ecae..7dad2e3d 100644 --- a/omod/src/main/java/org/openmrs/web/controller/maintenance/ServerLogController.java +++ b/omod/src/main/java/org/openmrs/web/controller/maintenance/ServerLogController.java @@ -15,9 +15,9 @@ import java.util.Collections; import java.util.List; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/maintenance/SettingsController.java b/omod/src/main/java/org/openmrs/web/controller/maintenance/SettingsController.java index 9ff721f3..0ff3c3a0 100644 --- a/omod/src/main/java/org/openmrs/web/controller/maintenance/SettingsController.java +++ b/omod/src/main/java/org/openmrs/web/controller/maintenance/SettingsController.java @@ -15,8 +15,8 @@ import java.util.SortedSet; import java.util.TreeSet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; diff --git a/omod/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java b/omod/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java index 691a68e5..d4866a58 100644 --- a/omod/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java @@ -14,10 +14,10 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/observation/PersonObsFormController.java b/omod/src/main/java/org/openmrs/web/controller/observation/PersonObsFormController.java index f252f60c..c44f0259 100644 --- a/omod/src/main/java/org/openmrs/web/controller/observation/PersonObsFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/observation/PersonObsFormController.java @@ -13,7 +13,7 @@ import java.util.Comparator; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/omod/src/main/java/org/openmrs/web/controller/observation/handler/WebMediaHandler.java b/omod/src/main/java/org/openmrs/web/controller/observation/handler/WebMediaHandler.java index b0d9fabd..15dcf1f4 100644 --- a/omod/src/main/java/org/openmrs/web/controller/observation/handler/WebMediaHandler.java +++ b/omod/src/main/java/org/openmrs/web/controller/observation/handler/WebMediaHandler.java @@ -9,6 +9,7 @@ */ package org.openmrs.web.controller.observation.handler; +import java.io.File; import java.util.Locale; import java.util.List; import java.util.ArrayList; @@ -65,7 +66,7 @@ public Obs getObs(Obs obs, String view) { if (ComplexObsHandler.HTML_VIEW.equals(view)) { String mediaTag = ""; - String mimeType = OpenmrsUtil.getFileMimeType(getComplexDataFile(obs)); + String mimeType = OpenmrsUtil.getFileMimeType(new File(parseDataKey(obs))); if (mimeType.contains("video")) { mediaTag = "

@@ -101,13 +123,7 @@ 1.0.12 - - javax.servlet - jsp-api - 2.0 - provided - - + @@ -173,43 +189,6 @@ @{project.version} - - com.mycila - license-maven-plugin - 3.0 - -

license-header.txt

- - **/*.java - **/*.txt - **/*.xml - - - license-header.txt - .git/** - tools/formatter/** - - .idea/** - target/** - bin/** - tmp/** - .settings/** - .externalToolBuilders/ - build/ - bin/ - dist/ - - - - - format-license-header - process-sources - - format - - - - net.revelc.code.formatter formatter-maven-plugin