Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D852765AD for ; Wed, 22 Jun 2011 22:50:57 +0000 (UTC) Received: (qmail 41811 invoked by uid 500); 22 Jun 2011 22:50:57 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 41747 invoked by uid 500); 22 Jun 2011 22:50:56 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 41738 invoked by uid 99); 22 Jun 2011 22:50:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jun 2011 22:50:56 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RFC_ABUSE_POST,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of knst.kolinko@gmail.com designates 209.85.212.45 as permitted sender) Received: from [209.85.212.45] (HELO mail-vw0-f45.google.com) (209.85.212.45) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jun 2011 22:50:50 +0000 Received: by vws17 with SMTP id 17so1355609vws.18 for ; Wed, 22 Jun 2011 15:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:content-type:content-transfer-encoding; bh=Oy0cuzmaWonQd8DReO8FlPdt8nNq61YRm61ThISHcvQ=; b=qJ4YDPiowtvFG4CuAIVDzRjc6hjmR4EvLRUbU1b9rSv0XYsw2sPAWrslTRUrAzIOZZ Uj8RdaGmmaU+VLOvUKVqkcjYTX/6yo2lgZy0g83HdbQLOJ2BwXP9XOTcaqYlRm1i2cY0 5Jec3/rKjt1d+MXrqElaf67JzxFig/ySDewlk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=PX8K7kL68EVQJkUJwsA8lrm9SnNqDGbX4D44xrsVbJIvOTkEmQeyjFiGbdBNbfUDOI VVQt5d2x0PmUfchfHzi0fzX8X0ggmBJbM+eaqftttlGX6HM0tz7JEh/nWPvn2K7amybB e4//18Fnx1bHzsAIvJ1Dy3eYUWIjlv/fAiYiw= MIME-Version: 1.0 Received: by 10.52.89.211 with SMTP id bq19mr1236206vdb.22.1308783028322; Wed, 22 Jun 2011 15:50:28 -0700 (PDT) Received: by 10.52.164.41 with HTTP; Wed, 22 Jun 2011 15:50:28 -0700 (PDT) In-Reply-To: <20110622183042.3EDE22388A3D@eris.apache.org> References: <20110622183042.3EDE22388A3D@eris.apache.org> Date: Thu, 23 Jun 2011 02:50:28 +0400 Message-ID: Subject: Re: svn commit: r1138573 - in /tomcat/trunk: java/org/apache/catalina/startup/Tomcat.java webapps/docs/changelog.xml From: Konstantin Kolinko To: Tomcat Developers List Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 2011/6/22 : > Author: markt > Date: Wed Jun 22 18:30:41 2011 > New Revision: 1138573 > > URL: http://svn.apache.org/viewvc?rev=3D1138573&view=3Drev > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=3D51418 > Provide more control over Context creation when embedding Tomcat. > Based on a patch by Benson Margulies. > > Modified: > =A0 =A0tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java > =A0 =A0tomcat/trunk/webapps/docs/changelog.xml > > + =A0 =A0public String noDefaultWebXmlPath() { > + =A0 =A0 =A0 =A0return "org/apache/catalin/startup/NO_DEFAULT_XML"; > + =A0 =A0} A typo in the above constant does not prevent it from working, but somehow bugs me. Searching for the string finds 4 places where it is used literally. And now it becomes part of API. Maybe 1) s/catalin/catalina/ 2) add it to o.a.c.startup.Constants, e.g. named as NoDefaultWebXml 3) use the value to short-circuit ContextConfig#getWebXmlSource(defaultWebXml, baseDir) to return null An alternative to 2)+3) is to put the constant into DefaultWebXmlListener, but I like 2)+3) better. Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org