svn commit: r614795 - /geronimo/server/trunk/repository/org/apache/tomcat/TOMCAT_6_0_14-G614585.patch

[ja...@apache.org]

Author: jaydm
Date: Wed Jan 23 20:55:41 2008
New Revision: 614795

URL: http://svn.apache.org/viewvc?rev=614795&view=rev
Log:
GERONIMO-3451
Missed committing the second patch file

Added:
    geronimo/server/trunk/repository/org/apache/tomcat/TOMCAT_6_0_14-G614585.patch

Added: geronimo/server/trunk/repository/org/apache/tomcat/TOMCAT_6_0_14-G614585.patch
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/apache/tomcat/TOMCAT_6_0_14-G614585.patch?rev=614795&view=auto
==============================================================================
--- geronimo/server/trunk/repository/org/apache/tomcat/TOMCAT_6_0_14-G614585.patch (added)
+++ geronimo/server/trunk/repository/org/apache/tomcat/TOMCAT_6_0_14-G614585.patch Wed Jan 23 20:55:41 2008
@@ -0,0 +1,43 @@
+Index: java/org/apache/catalina/core/DefaultInstanceManager.java
+===================================================================
+--- java/org/apache/catalina/core/DefaultInstanceManager.java	(revision 612966)
++++ java/org/apache/catalina/core/DefaultInstanceManager.java	(working copy)
+@@ -88,7 +88,7 @@
+                     this.getClass().getClassLoader().getResourceAsStream
+                             ("org/apache/catalina/core/RestrictedListeners.properties");
+             if (is != null) {
+-                restrictedFilters.load(is);
++                restrictedListeners.load(is);
+             } else {
+                 catalinaContext.getLogger().error(sm.getString("defaultInstanceManager.restrictedListenersResources"));
+             }
+Index: java/org/apache/catalina/core/RestrictedListeners.properties
+===================================================================
+--- java/org/apache/catalina/core/RestrictedListeners.properties	(revision 0)
++++ java/org/apache/catalina/core/RestrictedListeners.properties	(revision 0)
+@@ -0,0 +1,15 @@
++# Licensed to the Apache Software Foundation (ASF) under one or more
++# contributor license agreements.  See the NOTICE file distributed with
++# this work for additional information regarding copyright ownership.
++# The ASF licenses this file to You under the Apache License, Version 2.0
++# (the "License"); you may not use this file except in compliance with
++# the License.  You may obtain a copy of the License at
++#
++#     http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+
+Property changes on: java/org/apache/catalina/core/RestrictedListeners.properties
+___________________________________________________________________
+Name: svn:mime-type
+   + text/plain
+Name: svn:keywords
+   + Date Revision
+Name: svn:eol-style
+   + native
+