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 ACA0010D52 for ; Wed, 12 Jun 2013 18:40:58 +0000 (UTC) Received: (qmail 70917 invoked by uid 500); 12 Jun 2013 18:40:58 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 70848 invoked by uid 500); 12 Jun 2013 18:40:58 -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 70839 invoked by uid 99); 12 Jun 2013 18:40:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jun 2013 18:40:58 +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; Wed, 12 Jun 2013 18:40:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DC5942388900 for ; Wed, 12 Jun 2013 18:40:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1492346 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardContext.java java/org/apache/catalina/deploy/ApplicationListener.java Date: Wed, 12 Jun 2013 18:40:34 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130612184034.DC5942388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Wed Jun 12 18:40:34 2013 New Revision: 1492346 URL: http://svn.apache.org/r1492346 Log: Better name Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ApplicationListener.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1492336 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1492346&r1=1492345&r2=1492346&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Wed Jun 12 18:40:34 2013 @@ -4836,7 +4836,7 @@ public class StandardContext extends Con ApplicationListener listener = listeners[i]; results[i] = instanceManager.newInstance( listener.getClassName()); - if (listener.isFromTLD()) { + if (listener.isAllowedPluggability()) { tldListeners.add(results[i]); } } catch (Throwable t) { @@ -4897,7 +4897,7 @@ public class StandardContext extends Con new ServletContextEvent(getServletContext()); ServletContextEvent tldEvent = null; if (tldListeners.size() > 0) { - tldEvent = new ServletContextEvent(new TldListenerServletContext( + tldEvent = new ServletContextEvent(new NoPluggabilityServletContext( getServletContext())); } for (int i = 0; i < instances.length; i++) { @@ -6719,11 +6719,12 @@ public class StandardContext extends Con } - private static class TldListenerServletContext implements ServletContext { + private static class NoPluggabilityServletContext + implements ServletContext { private final ServletContext sc; - public TldListenerServletContext(ServletContext sc) { + public NoPluggabilityServletContext(ServletContext sc) { this.sc = sc; } Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ApplicationListener.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ApplicationListener.java?rev=1492346&r1=1492345&r2=1492346&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ApplicationListener.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ApplicationListener.java Wed Jun 12 18:40:34 2013 @@ -23,11 +23,12 @@ package org.apache.catalina.deploy; public class ApplicationListener { private final String className; - private final boolean fromTLD; + private final boolean allowedPluggability; - public ApplicationListener(String className, boolean fromTLD) { + public ApplicationListener(String className, + boolean allowedPluggability) { this.className = className; - this.fromTLD = fromTLD; + this.allowedPluggability = allowedPluggability; } @@ -36,7 +37,7 @@ public class ApplicationListener { } - public boolean isFromTLD() { - return fromTLD; + public boolean isAllowedPluggability() { + return allowedPluggability; } } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org