From 83ee476eb135bf8e892e032580020829e800a097 Mon Sep 17 00:00:00 2001 From: Wikum Weerakutti Date: Thu, 25 Sep 2025 23:08:28 +0530 Subject: [PATCH 01/19] 3.x --- omod/pom.xml | 25 +++--- .../hl7/web/HL7InQueueProcessorServlet.java | 12 +-- .../web/controller/ModuleListController.java | 8 +- .../ModuleManagementController.java | 4 +- .../ModulePropertiesFormController.java | 8 +- .../module/web/filter/AdminPageFilter.java | 12 +-- .../web/filter/ForcePasswordChangeFilter.java | 16 ++-- .../web/filter/RedirectAfterLoginFilter.java | 16 ++-- .../module/web/taglib/ExtensionPointTag.java | 10 +-- .../web/taglib/ExtensionPopupMenuTag.java | 6 +- .../notification/web/ForEachAlertTag.java | 4 +- .../web/controller/AlertFormController.java | 6 +- .../web/controller/AlertListController.java | 6 +- .../web/dwr/DWRMessageService.java | 2 +- .../controller/SchedulerFormController.java | 8 +- .../controller/SchedulerListController.java | 8 +- .../web/CopyLegacyUiContentToWebInf.java | 2 +- .../web/OpenmrsCookieLocaleResolver.java | 6 +- .../java/org/openmrs/web/SessionListener.java | 4 +- .../openmrs/web/WebComponentRegistrar.java | 8 +- .../web/attribute/WebAttributeUtil.java | 2 +- .../BooleanFieldGenDatatypeHandler.java | 2 +- .../handler/DateFieldGenDatatypeHandler.java | 2 +- .../handler/FieldGenDatatypeHandler.java | 2 +- .../LongFreeTextFileUploadHandler.java | 2 +- .../handler/LongFreeTextTextareaHandler.java | 2 +- .../RegexValidatedTextDatatypeHandler.java | 2 +- .../SerializingFieldGenDatatypeHandler.java | 2 +- .../SpecifiedTextOptionsDropdownHandler.java | 2 +- .../attribute/handler/WebDatatypeHandler.java | 2 +- .../web/controller/ConceptFormController.java | 8 +- .../ConceptStatsFormController.java | 6 +- .../web/controller/FieldGenController.java | 10 +-- .../ForgotPasswordFormController.java | 8 +- .../GlobalPropertyPortletController.java | 2 +- .../web/controller/OptionsFormController.java | 8 +- .../PatientEncountersPortletController.java | 2 +- .../PatientProgramsPortletController.java | 2 +- .../PatientVisitsPortletController.java | 2 +- .../PersonFormEntryPortletController.java | 2 +- .../PersonRelationshipsPortletController.java | 2 +- .../web/controller/PortletController.java | 10 +-- .../web/controller/RedirectController.java | 6 +- .../web/controller/bean/DatatableRequest.java | 2 +- .../concept/ConceptClassFormController.java | 8 +- .../concept/ConceptClassListController.java | 8 +- .../ConceptDatatypeListController.java | 8 +- .../concept/ConceptDrugFormController.java | 8 +- .../concept/ConceptDrugListController.java | 4 +- .../ConceptProposalFormController.java | 8 +- .../ConceptProposalListController.java | 4 +- .../concept/ConceptSourceFormController.java | 8 +- .../concept/ConceptSourceListController.java | 4 +- .../ConceptStopWordFormController.java | 2 +- .../ConceptStopWordListController.java | 2 +- .../concept/ProposeConceptFormController.java | 8 +- .../customdatatype/CustomValueController.java | 6 +- .../encounter/EncounterDisplayController.java | 4 +- .../encounter/EncounterFormController.java | 8 +- .../EncounterRoleFormController.java | 4 +- .../EncounterTypeFormController.java | 8 +- .../EncounterTypeListController.java | 4 +- .../encounter/LocationFormController.java | 8 +- .../encounter/LocationListController.java | 8 +- .../controller/form/AuditFieldController.java | 6 +- .../controller/form/FieldFormController.java | 8 +- .../controller/form/FieldListController.java | 2 +- .../form/FieldTypeFormController.java | 8 +- .../form/FieldTypeListController.java | 8 +- .../controller/form/FormFormController.java | 8 +- .../controller/form/FormListController.java | 8 +- .../form/FormResourceController.java | 4 +- .../hl7/HL7SourceFormController.java | 8 +- .../hl7/Hl7SourceListController.java | 4 +- .../layout/LayoutPortletController.java | 2 +- .../maintenance/CurrentUsersController.java | 4 +- .../maintenance/GlobalPropertyController.java | 8 +- .../ImplementationIdFormController.java | 4 +- .../maintenance/QuickReportsController.java | 2 +- .../maintenance/ServerLogController.java | 6 +- .../maintenance/SettingsController.java | 4 +- .../observation/ObsFormController.java | 8 +- .../observation/PersonObsFormController.java | 2 +- .../observation/handler/WebMediaHandler.java | 3 +- .../patient/MergePatientsFormController.java | 8 +- .../patient/PatientDashboardController.java | 4 +- .../patient/PatientFormController.java | 8 +- .../PatientIdentifierTypeFormController.java | 8 +- .../PatientIdentifierTypeListController.java | 4 +- .../patient/PatientListController.java | 8 +- .../patient/TribeFormController.java | 4 +- .../person/AddPersonController.java | 6 +- .../PersonAttributeTypeFormController.java | 8 +- .../PersonAttributeTypeListController.java | 2 +- .../person/PersonDashboardController.java | 4 +- .../person/PersonFormController.java | 8 +- .../RelationshipTypeFormController.java | 8 +- .../RelationshipTypeListController.java | 8 +- .../RelationshipTypeViewFormController.java | 8 +- .../program/PatientProgramFormController.java | 6 +- .../program/ProgramFormController.java | 8 +- .../program/ProgramListController.java | 8 +- .../StateConversionFormController.java | 8 +- .../StateConversionListController.java | 8 +- .../program/WorkflowFormController.java | 8 +- .../ProviderAttributeTypeFormController.java | 8 +- .../ProviderAttributeTypeListController.java | 4 +- .../provider/ProviderFormController.java | 4 +- .../PostHl7Controller.java | 4 +- .../user/ChangePasswordFormController.java | 2 +- .../user/PrivilegeFormController.java | 8 +- .../user/PrivilegeListController.java | 8 +- .../controller/user/RoleFormController.java | 8 +- .../controller/user/RoleListController.java | 8 +- .../web/controller/user/UserController.java | 4 +- .../controller/user/UserFormController.java | 4 +- .../visit/ConfigureVisitsFormController.java | 2 +- .../VisitAttributeTypeFormController.java | 8 +- .../VisitAttributeTypeListController.java | 4 +- .../controller/visit/VisitFormController.java | 4 +- .../controller/visit/VisitListController.java | 2 +- .../visit/VisitTypeFormController.java | 8 +- .../visit/VisitTypeListController.java | 4 +- .../org/openmrs/web/dwr/DWRObsService.java | 2 +- .../org/openmrs/web/dwr/DWRUserService.java | 2 +- .../java/org/openmrs/web/dwr/DwrFilter.java | 14 ++-- .../openmrs/web/dwr/DwrServletRequest.java | 76 ++++++++++++------- .../openmrs/web/dwr/OpenmrsDWRServlet.java | 14 ++-- .../web/servlet/AbstractGraphServlet.java | 8 +- .../web/servlet/ComplexObsServlet.java | 13 ++-- .../web/servlet/ConceptRedirectServlet.java | 8 +- .../web/servlet/DisplayChartServlet.java | 6 +- .../servlet/DownloadDictionaryServlet.java | 8 +- .../org/openmrs/web/servlet/LoginServlet.java | 10 +-- .../openmrs/web/servlet/LogoutServlet.java | 10 +-- .../web/servlet/QuickReportServlet.java | 10 +-- .../web/servlet/SampleFlowsheetServlet.java | 12 +-- .../openmrs/web/servlet/ShowGraphServlet.java | 8 +- .../java/org/openmrs/web/taglib/AuthTag.java | 2 +- .../org/openmrs/web/taglib/ConceptTag.java | 6 +- .../openmrs/web/taglib/ContextPathTag.java | 4 +- .../openmrs/web/taglib/DatePatternTag.java | 2 +- .../web/taglib/DateTimePatternTag.java | 2 +- .../openmrs/web/taglib/DisplayChartTag.java | 10 +-- .../org/openmrs/web/taglib/FieldGenTag.java | 8 +- .../taglib/ForEachDisplayAttributeTag.java | 4 +- .../web/taglib/ForEachDrugOrderTag.java | 6 +- .../web/taglib/ForEachEncounterTag.java | 6 +- .../org/openmrs/web/taglib/ForEachObsTag.java | 6 +- .../openmrs/web/taglib/ForEachRecordTag.java | 6 +- .../openmrs/web/taglib/ForEachVisitTag.java | 6 +- .../org/openmrs/web/taglib/FormatDateTag.java | 4 +- .../org/openmrs/web/taglib/FormatTag.java | 2 +- .../openmrs/web/taglib/GlobalPropertyTag.java | 2 +- .../openmrs/web/taglib/HtmlIncludeTag.java | 8 +- .../org/openmrs/web/taglib/ListPickerTag.java | 2 +- .../openmrs/web/taglib/ObsTableWidget.java | 4 +- .../taglib/OpenmrsHtmlEscapingAwareTag.java | 2 +- .../openmrs/web/taglib/OpenmrsMessageTag.java | 4 +- .../OpenmrsRequestContextAwareBodyTag.java | 8 +- .../openmrs/web/taglib/PatientWidgetTag.java | 4 +- .../org/openmrs/web/taglib/PortletTag.java | 17 +++-- .../org/openmrs/web/taglib/PrivilegeTag.java | 2 +- .../RequireConfigurationByPrefixTag.java | 8 +- .../web/taglib/RequireConfigurationTag.java | 8 +- .../org/openmrs/web/taglib/RequireTag.java | 8 +- .../org/openmrs/web/taglib/ShowGraphTag.java | 6 +- .../org/openmrs/web/taglib/SummaryTest.java | 2 +- .../openmrs/web/taglib/TimePatternTag.java | 2 +- .../openmrs/web/taglib/UserPropertyTag.java | 2 +- .../org/openmrs/web/taglib/UserWidgetTag.java | 4 +- .../fieldgen/AbstractFieldGenHandler.java | 4 +- .../org/openmrs/web/user/CurrentUsers.java | 4 +- .../java/org/openmrs/web/xss/XSSFilter.java | 19 ++--- .../openmrs/web/xss/XSSRequestWrapper.java | 29 +++++-- .../java/org/openmrs/web/xss/XSSUtil.java | 2 +- .../servlet/mvc/AbstractFormController.java | 8 +- .../mvc/AbstractWizardFormController.java | 6 +- .../servlet/mvc/BaseCommandController.java | 4 +- .../web/servlet/mvc/SimpleFormController.java | 6 +- .../resources/webModuleApplicationContext.xml | 53 ++----------- .../SchedulerFormControllerTest.java | 4 +- .../web/controller/SchedulerFormTest.java | 2 +- ...RegexValidatedTextDatatypeHandlerTest.java | 2 +- .../controller/ConceptFormControllerTest.java | 4 +- .../ForgotPasswordFormControllerTest.java | 2 +- .../GlobalPropertyPortletControllerTest.java | 2 +- .../controller/OptionsFormControllerTest.java | 4 +- .../web/controller/PortletControllerTest.java | 4 +- .../ConceptProposalFormControllerTest.java | 4 +- .../ConceptSourceFormControllerTest.java | 4 +- .../ConceptStopWordFormControllerTest.java | 2 +- .../ConceptStopWordListControllerTest.java | 2 +- .../EncounterFormControllerTest.java | 3 +- .../EncounterRoleFormControllerTest.java | 2 +- .../EncounterTypeFormControllerTest.java | 2 +- .../EncounterTypeListControllerTest.java | 4 +- .../encounter/LocationFormControllerTest.java | 4 +- .../form/FieldFormControllerTest.java | 4 +- .../form/FieldTypeListControllerTest.java | 4 +- .../form/FormFormControllerTest.java | 2 +- .../GlobalPropertyControllerTest.java | 4 +- .../observation/ObsFormControllerTest.java | 2 +- .../PatientDashboardControllerTest.java | 2 +- .../patient/PatientFormControllerTest.java | 2 +- ...tientIdentifierTypeFormControllerTest.java | 2 +- .../person/AddPersonControllerTest.java | 4 +- ...PersonAttributeTypeFormControllerTest.java | 2 +- ...PersonAttributeTypeListControllerTest.java | 2 +- .../program/ProgramFormControllerTest.java | 4 +- .../program/WorkflowFormControllerTest.java | 4 +- .../ChangePasswordFormControllerTest.java | 2 +- .../user/UserFormControllerTest.java | 2 +- .../DownloadDictionaryServletTest.java | 2 +- .../web/servlet/ShowGraphServletTest.java | 2 +- .../web/taglib/ForEachEncounterTagTest.java | 4 +- .../org/openmrs/web/taglib/FormatTagTest.java | 4 +- .../web/taglib/OpenmrsMessageTagTest.java | 4 +- .../openmrs/web/taglib/PrivilegeTagTest.java | 2 +- .../openmrs/web/taglib/RequireTagTest.java | 4 +- .../include/SchedulerFormControllerTest.xml | 2 +- .../openmrs/web/include/TaskHelperTest.xml | 2 +- pom.xml | 18 ++--- 223 files changed, 687 insertions(+), 679 deletions(-) diff --git a/omod/pom.xml b/omod/pom.xml index 12cd729b..d3aaad1f 100755 --- a/omod/pom.xml +++ b/omod/pom.xml @@ -111,25 +111,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,6 +126,18 @@ test + + org.apache.commons + commons-fileupload2-jakarta + 2.0.0-M1 + + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + 3.0.2 + + 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..01a61201 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; 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..3158fb71 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; 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/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..86d595ae 100644 --- a/omod/src/main/java/org/openmrs/web/WebComponentRegistrar.java +++ b/omod/src/main/java/org/openmrs/web/WebComponentRegistrar.java @@ -9,10 +9,10 @@ */ package org.openmrs.web; -import javax.servlet.DispatcherType; -import javax.servlet.FilterRegistration.Dynamic; -import javax.servlet.ServletContext; -import javax.servlet.ServletRegistration; +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; 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..d54e5572 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; 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/OptionsFormController.java b/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java index 4cd82527..61ef0bd8 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; 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..7b5b371f 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; 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..5f14cd89 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; 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..5e73bb7a 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; 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..d50fc370 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; 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 = "