From f43204de4f29ae365baee7ef95686beff45dd1e6 Mon Sep 17 00:00:00 2001
From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 20 Jun 2011 08:06:56 +0000
Subject: [PATCH] Add the Tomcat extras JARs to the list of JARs to skip when
 scanning for TLDs and web fragments.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1137541 13f79535-47bb-0310-9956-ffa450edef68
---
 conf/catalina.properties   | 1 +
 webapps/docs/changelog.xml | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/conf/catalina.properties b/conf/catalina.properties
index db4ee75ca..c6555bb97 100644
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
@@ -92,6 +92,7 @@ catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-tribes.jar,\
 jasper.jar,jasper-el.jar,ecj-*.jar,\
 tomcat-api.jar,tomcat-util.jar,tomcat-coyote.jar,tomcat-dbcp.jar,\
 tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
+tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\
 commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,\
 commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,\
 commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f10a26325..1af7c8303 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -68,6 +68,10 @@
         <bug>49165</bug>: Allow any time stamp formats supported by SimpleDateFormat
         in AccessLogValve. Support logging begin and/or end of request. (rjung)
       </fix>
+      <add>
+        Add the Tomcat extras JARs to the list of JARs to skip when scanning
+        for TLDs and web fragments. (rjung)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Coyote">
-- 
2.11.0