tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
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 GMT
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


Mime
View raw message