From commits-return-22884-apmail-ofbiz-commits-archive=ofbiz.apache.org@ofbiz.apache.org Sat Dec 3 13:39:49 2011 Return-Path: X-Original-To: apmail-ofbiz-commits-archive@www.apache.org Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 71BB5770E for ; Sat, 3 Dec 2011 13:39:49 +0000 (UTC) Received: (qmail 43857 invoked by uid 500); 3 Dec 2011 13:39:49 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 43810 invoked by uid 500); 3 Dec 2011 13:39:48 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 43803 invoked by uid 99); 3 Dec 2011 13:39:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Dec 2011 13:39:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Dec 2011 13:39:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CB23823889DA for ; Sat, 3 Dec 2011 13:39:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1209911 - in /ofbiz/branches/release11.04: ./ framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp Date: Sat, 03 Dec 2011 13:39:25 -0000 To: commits@ofbiz.apache.org From: jleroux@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111203133925.CB23823889DA@eris.apache.org> Author: jleroux Date: Sat Dec 3 13:39:25 2011 New Revision: 1209911 URL: http://svn.apache.org/viewvc?rev=1209911&view=rev Log: "Applied fix from trunk for revision: 1208335" conflict handled by hand in webapp/ecommerce/WEB-INF/web.xml I noticed Eclipse reports a syntax issue in the trunk webapp/ecommerce/WEB-INF/web.xml file, not sure it's a problem and not enough time to look at it closer ------------------------------------------------------------------------ r1208335 | hansbak | 2011-11-30 10:06:48 +0100 (mer., 30 nov. 2011) | 1 line Return a 404 error and not redirect to control main in the ecommerce: https://issues.apache.org/jira/browse/OFBIZ-4390 ------------------------------------------------------------------------ Added: ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp - copied unchanged from r1208335, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp Modified: ofbiz/branches/release11.04/ (props changed) ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Propchange: ofbiz/branches/release11.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Dec 3 13:39:25 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4:951708-952957 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1209250,1209362 +/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362 Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=1209911&r1=1209910&r2=1209911&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java Sat Dec 3 13:39:25 2011 @@ -251,7 +251,7 @@ public class ContextFilter implements Fi // check to make sure the requested url is allowed if (!allowList.contains(requestPath) && !allowList.contains(requestInfo) && !allowList.contains(httpRequest.getServletPath())) { String filterMessage = "[Filtered request]: " + contextUri; - + if (redirectPath == null) { int error = 404; if (UtilValidate.isNotEmpty(errorCode)) { @@ -263,6 +263,7 @@ public class ContextFilter implements Fi } filterMessage = filterMessage + " (" + error + ")"; wrapper.sendError(error, contextUri); + request.setAttribute("filterRequestUriError", contextUri); } else { filterMessage = filterMessage + " (" + redirectPath + ")"; if (!redirectPath.toLowerCase().startsWith("http")) { Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1209911&r1=1209910&r2=1209911&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original) +++ ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Sat Dec 3 13:39:25 2011 @@ -70,20 +70,26 @@ under the License. allowedPaths /error:/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images - + + ContextFilter /* + + 404 + /error/404.jsp + + org.ofbiz.webapp.control.ControlEventListener