Index: applications/product/webapp/catalog/error/error.jsp =================================================================== --- applications/product/webapp/catalog/error/error.jsp (révision 1849863) +++ applications/product/webapp/catalog/error/error.jsp (nonexistent) @@ -1,53 +0,0 @@ -<%-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---%> - -<%@ page import="org.apache.ofbiz.base.util.*" %> - - -OFBiz Message - - - -<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %> - - -

-
- - - - -

- - - - - - - -

:ERROR MESSAGE:

<%=UtilFormatOut.replaceString(errorMsg, "\n", "
")%>

- - Modification de propriétés sur applications/product/webapp/catalog/error/error.jsp ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -"Date Rev Author URL Id" \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: framework/common/webcommon/WEB-INF/common-controller.xml =================================================================== --- framework/common/webcommon/WEB-INF/common-controller.xml (révision 1849863) +++ framework/common/webcommon/WEB-INF/common-controller.xml (copie de travail) @@ -23,7 +23,7 @@ Common ControlServlet Configuration File - /error/error.jsp + component://common/webcommon/error/error.ftl Index: framework/common/webcommon/error/error.ftl =================================================================== --- framework/common/webcommon/error/error.ftl (révision 1849863) +++ framework/common/webcommon/error/error.ftl (copie de travail) @@ -1,4 +1,4 @@ -<%-- +<#-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information @@ -15,39 +15,22 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---%> - -<%@ page import="org.apache.ofbiz.base.util.*" %> +--> +<#if visualTheme?has_content> + <#include visualTheme.modelTheme.getErrorTemplateLocation('screen')/> +<#else> OFBiz Message - + -<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %> -

-
- - - - -

- - - - - - - -

:ERROR MESSAGE:

<%=UtilFormatOut.replaceString(errorMsg, "\n", "
")%>

ERROR MESSAGE

${Static['org.apache.ofbiz.base.util.UtilFormatOut'].replaceString(request.getAttribute('_ERROR_MESSAGE_'), "\n", "
")}

+ Index: framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java =================================================================== --- framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java (révision 1849863) +++ framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java (copie de travail) @@ -18,9 +18,13 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.control; +import freemarker.template.Template; +import freemarker.template.TemplateException; import java.io.IOException; import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; import javax.servlet.RequestDispatcher; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -33,6 +37,7 @@ import org.apache.ofbiz.base.util.UtilCodec; import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.base.util.UtilHttp; +import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilTimer; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.template.FreeMarkerWorker; @@ -224,9 +229,9 @@ request.setAttribute("_ERROR_MESSAGE_", UtilCodec.getEncoder("html").encode(throwable.toString())); errorPage = handler.getDefaultErrorPage(request); } - } catch (RequestHandlerExceptionAllowExternalRequests e) { - errorPage = handler.getDefaultErrorPage(request); - Debug.logInfo("Going to external page: " + request.getPathInfo(), module); + } catch (RequestHandlerExceptionAllowExternalRequests e) { + errorPage = handler.getDefaultErrorPage(request); + Debug.logInfo("Going to external page: " + request.getPathInfo(), module); } catch (Exception e) { Debug.logError(e, "Error in request handler: ", module); request.setAttribute("_ERROR_MESSAGE_", UtilCodec.getEncoder("html").encode(e.toString())); @@ -240,41 +245,62 @@ if (errorPage != null) { Debug.logError("An error occurred, going to the errorPage: " + errorPage, module); - RequestDispatcher rd = request.getRequestDispatcher(errorPage); + Map context = new HashMap<>(); + context.put("request", request); + context.put("response", response); + context.put("session", session); + context.put("dispatcher", dispatcher); + context.put("delegator", delegator); + context.put("security", security); + context.put("locale", UtilHttp.getLocale(request)); + context.put("timeZone", UtilHttp.getTimeZone(request)); + context.put("userLogin", session.getAttribute("userLogin")); + context.put("visualTheme", UtilHttp.getVisualTheme(request)); - // use this request parameter to avoid infinite looping on errors in the error page... - if (request.getAttribute("_ERROR_OCCURRED_") == null && rd != null) { - request.setAttribute("_ERROR_OCCURRED_", Boolean.TRUE); - Debug.logError("Including errorPage: " + errorPage, module); + if (errorPage.endsWith(".jsp")) { + RequestDispatcher rd = request.getRequestDispatcher(errorPage); - // NOTE DEJ20070727 after having trouble with all of these, try to get the page out and as a last resort just send something back - try { - rd.include(request, response); - } catch (Throwable t) { - Debug.logWarning("Error while trying to send error page using rd.include (will try response.getOutputStream or response.getWriter): " + t.toString(), module); + // use this request parameter to avoid infinite looping on errors in the error page... + if (request.getAttribute("_ERROR_OCCURRED_") == null && rd != null) { + request.setAttribute("_ERROR_OCCURRED_", Boolean.TRUE); + Debug.logError("Including errorPage: " + errorPage, module); - String errorMessage = "ERROR rendering error page [" + errorPage + "], but here is the error text: " + request.getAttribute("_ERROR_MESSAGE_"); + // NOTE DEJ20070727 after having trouble with all of these, try to get the page out and as a last resort just send something back try { - response.getWriter().print(errorMessage); - } catch (Throwable t2) { + rd.include(request, response); + } catch (Throwable t) { + Debug.logWarning("Error while trying to send error page using rd.include (will try response.getOutputStream or response.getWriter): " + t.toString(), module); + + String errorMessage = "ERROR rendering error page [" + errorPage + "], but here is the error text: " + request.getAttribute("_ERROR_MESSAGE_"); try { - int errorToSend = HttpServletResponse.SC_INTERNAL_SERVER_ERROR; - Debug.logWarning("Error while trying to write error message using response.getOutputStream or response.getWriter: " + t.toString() + "; sending error code [" + errorToSend + "], and message [" + errorMessage + "]", module); - response.sendError(errorToSend, errorMessage); - } catch (Throwable t3) { - // wow, still bad... just throw an IllegalStateException with the message and let the servlet container handle it - throw new IllegalStateException(errorMessage); + response.getWriter().print(errorMessage); + } catch (Throwable t2) { + try { + int errorToSend = HttpServletResponse.SC_INTERNAL_SERVER_ERROR; + Debug.logWarning("Error while trying to write error message using response.getOutputStream or response.getWriter: " + t.toString() + "; sending error code [" + errorToSend + "], and message [" + errorMessage + "]", module); + response.sendError(errorToSend, errorMessage); + } catch (Throwable t3) { + // wow, still bad... just throw an IllegalStateException with the message and let the servlet container handle it + throw new IllegalStateException(errorMessage); + } } } + + } else { + if (rd == null) { + Debug.logError("Could not get RequestDispatcher for errorPage: " + errorPage, module); + } + + String errorMessage = "ERROR in error page, (infinite loop or error page not found with name [" + errorPage + "]), but here is the text just in case it helps you: " + request.getAttribute("_ERROR_MESSAGE_") + ""; + response.getWriter().print(errorMessage); } - } else { - if (rd == null) { - Debug.logError("Could not get RequestDispatcher for errorPage: " + errorPage, module); + Template template = FreeMarkerWorker.getTemplate(errorPage); + try { + FreeMarkerWorker.renderTemplate(template, context, response.getWriter()); + } catch (TemplateException e) { + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString()); } - - String errorMessage = "ERROR in error page, (infinite loop or error page not found with name [" + errorPage + "]), but here is the text just in case it helps you: " + request.getAttribute("_ERROR_MESSAGE_") + ""; - response.getWriter().print(errorMessage); } } Index: framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java =================================================================== --- framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java (révision 1849863) +++ framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java (copie de travail) @@ -18,6 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.webapp.control; +import java.net.MalformedURLException; +import org.apache.ofbiz.base.location.FlexibleLocation; import static org.apache.ofbiz.base.util.UtilGenerics.checkMap; import java.io.IOException; @@ -801,14 +803,17 @@ /** Returns the default error page for this request. */ public String getDefaultErrorPage(HttpServletRequest request) { - String errorpage = null; + URL errorPage = null; try { - errorpage = getControllerConfig().getErrorpage(); - } catch (WebAppConfigurationException e) { + String errorPageLocation = getControllerConfig().getErrorpage(); + errorPage = FlexibleLocation.resolveLocation(errorPageLocation); + } catch (WebAppConfigurationException | MalformedURLException e) { Debug.logError(e, "Exception thrown while parsing controller.xml file: ", module); } - if (UtilValidate.isNotEmpty(errorpage)) return errorpage; - return "/error/error.jsp"; + if (errorPage == null) { + return "/error/error.jsp"; + } + return errorPage.toString(); } /** Returns the default status-code for this request. */ Index: framework/widget/dtd/widget-theme.xsd =================================================================== --- framework/widget/dtd/widget-theme.xsd (révision 1849863) +++ framework/widget/dtd/widget-theme.xsd (copie de travail) @@ -152,7 +152,7 @@ - + @@ -171,6 +171,7 @@ + Index: framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java =================================================================== --- framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java (révision 1849863) +++ framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTheme.java (copie de travail) @@ -390,6 +390,13 @@ } return null; } + public String getErrorTemplateLocation(String name) { + ModelTemplate modelTemplate = modelTemplateMap.get(name); + if (modelTemplate != null) { + return modelTemplate.getErrorTemplateLocation(); + } + return null; + } public Map getModelCommonScreens() { return modelCommonScreensMap; @@ -410,6 +417,7 @@ private final String formRendererLocation; private final String menuRendererLocation; private final String treeRendererLocation; + private final String errorTemplateLocation; /** * Constructor to initialize a ModelTemplate class from xml definition @@ -427,6 +435,7 @@ String formRendererLocation = null; String menuRendererLocation = null; String treeRendererLocation = null; + String errorTemplateLocation = null; for (Element templateFile : UtilXml.childElementList(template)) { switch (templateFile.getAttribute("widget")) { case "screen": @@ -441,6 +450,9 @@ case "menu": menuRendererLocation = templateFile.getAttribute("location"); break; + case "error": + errorTemplateLocation = templateFile.getAttribute("location"); + break; } } this.screenRendererLocation = screenRendererLocation; @@ -447,6 +459,7 @@ this.formRendererLocation = formRendererLocation; this.menuRendererLocation = menuRendererLocation; this.treeRendererLocation = treeRendererLocation; + this.errorTemplateLocation = errorTemplateLocation; } /** @@ -466,6 +479,7 @@ this.formRendererLocation = exist && currentModelTemplate.formRendererLocation != null ? currentModelTemplate.formRendererLocation : originModelTemplate.formRendererLocation; this.treeRendererLocation = exist && currentModelTemplate.treeRendererLocation != null ? currentModelTemplate.treeRendererLocation : originModelTemplate.treeRendererLocation; this.menuRendererLocation = exist && currentModelTemplate.menuRendererLocation != null ? currentModelTemplate.menuRendererLocation : originModelTemplate.menuRendererLocation; + this.errorTemplateLocation = exist && currentModelTemplate.errorTemplateLocation != null ? currentModelTemplate.errorTemplateLocation : originModelTemplate.errorTemplateLocation; } public String getEncoder() { return encoder; @@ -493,5 +507,8 @@ public String getMenuRendererLocation() { return menuRendererLocation; } + public String getErrorTemplateLocation() { + return errorTemplateLocation; + } } } Index: themes/common-theme/template/ErrorPage.ftl =================================================================== --- themes/common-theme/template/ErrorPage.ftl (nonexistent) +++ themes/common-theme/template/ErrorPage.ftl (copie de travail) @@ -0,0 +1,509 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + + + + 500 Internal error + + + +

ERROR MESSAGE

${Static['org.apache.ofbiz.base.util.UtilFormatOut'].replaceString(request.getAttribute("_ERROR_MESSAGE_"), "\n", "
")}

+ +

+ \ No newline at end of file Modification de propriétés sur themes/common-theme/template/ErrorPage.ftl ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Rev Author URL Id \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: themes/common-theme/widget/Theme.xml =================================================================== --- themes/common-theme/widget/Theme.xml (révision 1849863) +++ themes/common-theme/widget/Theme.xml (copie de travail) @@ -93,6 +93,7 @@