这是indexloc提供的服务，不要输入任何密码
Skip to content

Update the module to Platform 3.x #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from
Draft

Update the module to Platform 3.x #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
83ee476
3.x
wikumChamith Sep 25, 2025
45b64d2
Update the module to platform 3.x
wikumChamith Oct 1, 2025
aabc71b
Migrate from XML MVC annotations -> Java Config
ibacher Oct 8, 2025
e23162b
Deal with some problems in the ConceptFormControllerTest
ibacher Oct 8, 2025
126f0b2
Fix DWRConceptServiceTest errors
wikumChamith Oct 10, 2025
f66ed95
Fix ProgramFormControllerTest error
wikumChamith Oct 10, 2025
99abcca
Fix ConceptFormController lazy initialization error
wikumChamith Oct 24, 2025
a324efd
Fix ConceptFormControllerTest initialization issue
wikumChamith Oct 26, 2025
89d046e
Add "provided" scope to dependencies in omod/pom.xml
wikumChamith Oct 26, 2025
6797d62
Migrate to Jakarta EE by replacing javax.* references with jakarta.* …
wikumChamith Oct 26, 2025
ebaa8da
Exclude additional taglibs artifacts from dependencies in pom.xml
wikumChamith Oct 26, 2025
8dd08df
Migrate JSP taglib references from javax.* to jakarta.* for Jakarta E…
wikumChamith Oct 26, 2025
c48780f
Migrate JSP taglib and tag class references from javax.* to jakarta.*…
wikumChamith Oct 29, 2025
c4efe4c
Remove JSTL core validation from c-rt.tld as it is no longer needed
wikumChamith Oct 29, 2025
b92ecd4
Remove legacy tag library definitions and migrate JSP to use Jakarta …
wikumChamith Oct 29, 2025
6dfeeb7
Remove the c-rt.tld file.
wikumChamith Oct 29, 2025
fa328f1
Remove JSTL dependencies and update JSP files for Jakarta taglibs com…
wikumChamith Oct 29, 2025
919ef99
Add Jakarta taglib references to JSP files for compatibility.
wikumChamith Oct 30, 2025
f0f00f9
Introduce `LegacyCatchAllController` to handle legacy URL mappings an…
wikumChamith Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
26 changes: 13 additions & 13 deletions omod/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@
<groupId>org.openmrs.api</groupId>
<artifactId>openmrs-api</artifactId>
<type>jar</type>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -111,33 +117,27 @@
<dependency>
<groupId>org.openmrs.contrib</groupId>
<artifactId>dwr</artifactId>
<version>2.0.8-mod-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<scope>test</scope>
</dependency>


<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-jakarta</artifactId>
<version>2.0.0-M1</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down
12 changes: 6 additions & 6 deletions omod/src/main/java/org/openmrs/hl7/web/HL7InQueueProcessorServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions omod/src/main/java/org/openmrs/module/web/controller/ModuleListController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions omod/src/main/java/org/openmrs/module/web/controller/ModuleManagementController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions omod/src/main/java/org/openmrs/module/web/controller/ModulePropertiesFormController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions omod/src/main/java/org/openmrs/module/web/filter/AdminPageFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
16 changes: 8 additions & 8 deletions omod/src/main/java/org/openmrs/module/web/filter/ForcePasswordChangeFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions omod/src/main/java/org/openmrs/module/web/filter/RedirectAfterLoginFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions omod/src/main/java/org/openmrs/module/web/taglib/ExtensionPointTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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()) {
Expand Down Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions omod/src/main/java/org/openmrs/module/web/taglib/ExtensionPopupMenuTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions omod/src/main/java/org/openmrs/notification/web/ForEachAlertTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions omod/src/main/java/org/openmrs/notification/web/controller/AlertFormController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions omod/src/main/java/org/openmrs/notification/web/controller/AlertListController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion omod/src/main/java/org/openmrs/notification/web/dwr/DWRMessageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 6 additions & 5 deletions omod/src/main/java/org/openmrs/scheduler/web/controller/SchedulerFormController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
8 changes: 4 additions & 4 deletions omod/src/main/java/org/openmrs/scheduler/web/controller/SchedulerListController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion omod/src/main/java/org/openmrs/web/CopyLegacyUiContentToWebInf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
41 changes: 41 additions & 0 deletions omod/src/main/java/org/openmrs/web/LegacyUIJavaConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
}
}
Loading
Loading