You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2024/11/28 16:20:02 UTC
(ofbiz-plugins) branch trunk updated: Comply with the new viewMap interface.
This is an automated email from the ASF dual-hosted git repository.
nmalin pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new c4f956364 Comply with the new viewMap interface.
c4f956364 is described below
commit c4f9563644a243c8d5bbaca0f600561331593324
Author: Gil Portenseigne <gi...@nereide.fr>
AuthorDate: Fri Nov 15 15:51:56 2024 +0100
Comply with the new viewMap interface.
---
.../ofbiz/ecommerce/webapp/view/JspViewHandler.java | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java
index ff9ecc622..9b2eaf38f 100644
--- a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java
+++ b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java
@@ -21,6 +21,7 @@ package org.apache.ofbiz.ecommerce.webapp.view;
import java.io.IOException;
import java.net.URLEncoder;
+import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -29,7 +30,9 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
import org.apache.ofbiz.base.util.Debug;
+import org.apache.ofbiz.base.util.UtilMisc;
import org.apache.ofbiz.base.util.UtilValidate;
+import org.apache.ofbiz.webapp.control.ConfigXMLReader;
import org.apache.ofbiz.webapp.control.ControlFilter;
import org.apache.ofbiz.webapp.view.AbstractViewHandler;
import org.apache.ofbiz.webapp.view.ViewHandlerException;
@@ -49,8 +52,14 @@ public class JspViewHandler extends AbstractViewHandler {
}
@Override
- public void render(String name, String page, String contentType, String encoding, String info, HttpServletRequest request,
- HttpServletResponse response) throws ViewHandlerException {
+ public Map<String, Object> prepareViewContext(HttpServletRequest request, HttpServletResponse response, ConfigXMLReader.ViewMap viewMap) {
+ return UtilMisc.toMap();
+ }
+
+
+ @Override
+ public void render(String name, String page, String contentType, String encoding, String info, HttpServletRequest request, HttpServletResponse
+ response, Map<String, Object> context) throws ViewHandlerException {
// some containers call filters on EVERY request, even forwarded ones,
// so let it know that it came from the control servlet
@@ -70,10 +79,10 @@ public class JspViewHandler extends AbstractViewHandler {
if (rd == null) {
Debug.logInfo("HttpServletRequest.getRequestDispatcher() failed; trying ServletContext", MODULE);
- rd = context.getRequestDispatcher(page);
+ rd = this.context.getRequestDispatcher(page);
if (rd == null) {
Debug.logInfo("ServletContext.getRequestDispatcher() failed; trying ServletContext.getNamedDispatcher(\"jsp\")", MODULE);
- rd = context.getNamedDispatcher("jsp");
+ rd = this.context.getNamedDispatcher("jsp");
if (rd == null) {
throw new ViewHandlerException("Source returned a null dispatcher (" + page + ")");
}