You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2022/06/11 12:42:57 UTC

[ofbiz-plugins] branch trunk updated: Improved: Ecommerce Error Page Does Not Work (OFBIZ-4390)

This is an automated email from the ASF dual-hosted git repository.

jleroux 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 e18d5768a Improved: Ecommerce Error Page Does Not Work (OFBIZ-4390)
e18d5768a is described below

commit e18d5768ac3b986384b04eeb6cf6f9358ca32be3
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Sat Jun 11 14:43:08 2022 +0200

    Improved: Ecommerce Error Page Does Not Work (OFBIZ-4390)
    
    Currently when an error occures in ecommerce or ecomseo CsrfUtil::checkToken
    throws the RequestHandlerException "Invalid or missing CSRF token for AJAX call..."
    
    It's only disturbing in log for no benefit. This feature seems obsolete and
    we should rather get rids of it.
    
    I don't backport in case I'd proved wrong
---
 ecommerce/webapp/ecommerce/WEB-INF/web.xml |  5 ---
 ecommerce/webapp/ecommerce/error/404.jsp   | 54 ------------------------------
 ecommerce/webapp/ecomseo/WEB-INF/web.xml   |  5 ---
 3 files changed, 64 deletions(-)

diff --git a/ecommerce/webapp/ecommerce/WEB-INF/web.xml b/ecommerce/webapp/ecommerce/WEB-INF/web.xml
index 7e8f30e05..b948d80a9 100644
--- a/ecommerce/webapp/ecommerce/WEB-INF/web.xml
+++ b/ecommerce/webapp/ecommerce/WEB-INF/web.xml
@@ -163,9 +163,4 @@ under the License.
         <welcome-file>index.html</welcome-file>
         <welcome-file>index.htm</welcome-file>
     </welcome-file-list>
-
-    <error-page>
-        <error-code>404</error-code>
-        <location>/error/404.jsp</location>
-    </error-page>
 </web-app>
diff --git a/ecommerce/webapp/ecommerce/error/404.jsp b/ecommerce/webapp/ecommerce/error/404.jsp
deleted file mode 100644
index 78cfcf9d9..000000000
--- a/ecommerce/webapp/ecommerce/error/404.jsp
+++ /dev/null
@@ -1,54 +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="java.util.*" %>
-<%@ page import="org.apache.ofbiz.base.util.*" %>
-<%@ page import="org.apache.ofbiz.entity.*" %>
-<%@ page import="org.apache.ofbiz.entity.util.*" %>
-<%@ page import="org.apache.ofbiz.webapp.website.WebSiteWorker" %>
-<jsp:useBean id="delegator" type="org.apache.ofbiz.entity.GenericDelegator" scope="request" />
-<%
-ServletContext context = pageContext.getServletContext();
-String webSiteId = WebSiteWorker.getWebSiteId(request);
-List<GenericValue> webAnalytics = delegator.findByAnd("WebAnalyticsConfig", UtilMisc.toMap("webSiteId", webSiteId), null, false);
-%>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<title>Error 404</title>
-<%if (webAnalytics != null) {%>
-<script type="application/javascript">
-<%for (GenericValue webAnalytic : webAnalytics) {%>
-    <%=StringUtil.wrapString((String) webAnalytic.get("webAnalyticsCode"))%>
-<%}%>
-</script>
-<%}%>
-</head>
-<body>
-<p>
-<strong>404.</strong>
-<ins>That&#39;s an error.</ins>
-</p>
-<p>
-The requested URL
-<code><%=request.getAttribute("filterRequestUriError")%></code>
-was not found on this server.
-<ins>That&#39;s all we know.</ins>
-</p>
-</body>
-</html>
diff --git a/ecommerce/webapp/ecomseo/WEB-INF/web.xml b/ecommerce/webapp/ecomseo/WEB-INF/web.xml
index 4bdb63835..67eea60ec 100644
--- a/ecommerce/webapp/ecomseo/WEB-INF/web.xml
+++ b/ecommerce/webapp/ecomseo/WEB-INF/web.xml
@@ -156,9 +156,4 @@ under the License.
         <welcome-file>index.html</welcome-file>
         <welcome-file>index.htm</welcome-file>
     </welcome-file-list>
-
-    <error-page>
-        <error-code>404</error-code>
-        <location>/error/404.jsp</location>
-    </error-page>
 </web-app>