From scm-return-48559-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Tue Jun 12 02:00:39 2012 Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E88529886 for ; Tue, 12 Jun 2012 02:00:38 +0000 (UTC) Received: (qmail 78553 invoked by uid 500); 12 Jun 2012 02:00:38 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 78437 invoked by uid 500); 12 Jun 2012 02:00:38 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 78427 invoked by uid 99); 12 Jun 2012 02:00:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2012 02:00:38 +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; Tue, 12 Jun 2012 02:00:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F3FD3238896F; Tue, 12 Jun 2012 02:00:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1349091 - /geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java Date: Tue, 12 Jun 2012 02:00:16 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120612020016.F3FD3238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xiaming Date: Tue Jun 12 02:00:16 2012 New Revision: 1349091 URL: http://svn.apache.org/viewvc?rev=1349091&view=rev Log: GERONIMO-5882 Make sure the parent servlet configurations are visible in users' web.xml file, patch provided by xiezhi Modified: geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java Modified: geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java?rev=1349091&r1=1349090&r2=1349091&view=diff ============================================================================== --- geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java (original) +++ geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java Tue Jun 12 02:00:16 2012 @@ -77,6 +77,8 @@ public class WebAppInfoBuilder { private WebAppInfo webAppInfo; + private static final String TOMCAT_DEFAULT_SERVLET_NAME = "default"; + public WebAppInfoBuilder(WebApp webApp, WebAppInfoFactory webAppInfoFactory) { this.webApp = webApp; this.webAppInfoFactory = webAppInfoFactory; @@ -246,7 +248,9 @@ public class WebAppInfoBuilder { String servletName = servletMapping.getServletName().trim(); ServletInfo servletInfo = servletMap.get(servletName); if (servletInfo == null) { - problems.add("\nNo servlet matching servlet mappings for " + servletName); + if (!TOMCAT_DEFAULT_SERVLET_NAME.equals(servletName)) { + problems.add("\nNo servlet matching servlet mappings for " + servletName); + } } else { normalizeUrlPatterns(servletMapping.getUrlPattern(), servletInfo.servletMappings); }