Author: fhanik
Date: Tue Mar 18 12:58:29 2008
New Revision: 638546

URL: http://svn.apache.org/viewvc?rev=638546&view=rev
Log:
Apply patch

Modified:
    
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java
    tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java?rev=638546&r1=638545&r2=638546&view=diff
==============================================================================
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java
 Tue Mar 18 12:58:29 2008
@@ -246,9 +246,6 @@
         digester.addCallMethod(prefix + 
"web-app/jsp-config/jsp-property-group/url-pattern",
                                "addJspMapping", 0);
 
-        digester.addCallMethod(prefix + "web-app/listener/listener-class",
-                               "addApplicationListener", 0);
-        
         digester.addRule(prefix + "web-app/login-config",
                          loginConfig);
 

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=638546&r1=638545&r2=638546&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Mar 18 12:58:29 2008
@@ -31,11 +31,6 @@
   +1: markt, fhanik
   -1:
 
-* Remove duplicate listner additions (backport from 6.0 trunk)
-  http://svn.apache.org/viewvc?rev=620844&view=rev
-  +1: pero, markt, fhanik
-  -1: 
-
 * Fix ArrayIndexOutOfBoundsException when empty URL is requested
   http://svn.apache.org/viewvc?rev=627883&view=rev
   +1: markt, fhanik



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to