Followup fixes to make ro run on core 3.x

Author: dkayiwa

omod/src/main/java/org/openmrs/web/controller/LegacyCatchAllController.java

@@ -45,7 +45,11 @@ public class LegacyCatchAllController implements Controller {
     private Controller personFormEntryPortletController;
 
     public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        String path = request.getRequestURI();
+        // For included requests (e.g. pageContext.include()), use the include request URI
+        String path = (String) request.getAttribute("jakarta.servlet.include.request_uri");
+        if (path == null) {
+            path = request.getRequestURI();
+        }
         if (path == null) {
             response.sendError(HttpServletResponse.SC_NOT_FOUND);
             return null;
@@ -141,5 +145,4 @@ public void setPatientVisitsPortletController(Controller patientVisitsPortletCon
     public void setPersonFormEntryPortletController(Controller personFormEntryPortletController) {
         this.personFormEntryPortletController = personFormEntryPortletController;
     }
-}
-
+}

omod/src/main/java/org/openmrs/web/taglib/PortletTag.java

@@ -9,18 +9,20 @@
  */
 package org.openmrs.web.taglib;
 
-import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import java.io.IOException;
+import java.util.Map;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.module.Module;
 import org.openmrs.module.ModuleFactory;
 import org.openmrs.util.OpenmrsUtil;
 
+import jakarta.servlet.ServletException;
 import jakarta.servlet.jsp.JspException;
 import jakarta.servlet.jsp.JspTagException;
 import jakarta.servlet.jsp.PageContext;
-import java.io.IOException;
-import java.util.Map;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
 
 public class PortletTag extends BodyTagSupport {
 
@@ -88,13 +90,17 @@ public int doStartTag() throws JspException {
 				pageContext.getRequest().setAttribute("org.openmrs.portlet.userId", userId);
 				pageContext.getRequest().setAttribute("org.openmrs.portlet.patientIds", patientIds);
 				pageContext.getRequest().setAttribute("org.openmrs.portlet.parameterMap", parameterMap);
+				
+				// include the portlet content
+				pageContext.getOut().flush();
+				pageContext.include(url);
 			}
 		}
-		catch (IOException e) {
+		catch (IOException | ServletException e) {
 			log.error("Error while starting portlet tag", e);
 		}
 
-		return super.doStartTag();
+		return SKIP_BODY;
 	}
 
 	public int doEndTag() throws JspException {
@@ -265,4 +271,4 @@ public void setModuleId(String moduleId) {
 	public String getUrl() {
 		return url;
 	}
-}
+}

omod/src/main/webapp/template/include.jsp

@@ -1,4 +1,5 @@
 <%@ taglib prefix="openmrs" uri="/WEB-INF/view/module/legacyui/taglibs/openmrs.tld" %>
 <%@ taglib prefix="openmrs_tag" tagdir="/WEB-INF/tags/module/legacyui" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>