More Jars to skip: ant-junit and Java Help.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1137754 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/conf/catalina.properties b/conf/catalina.properties
index c6555bb..918bbcc 100644 (file)
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
@@ -99,11 +99,11 @@ commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\
 commons-math*.jar,commons-pool*.jar,\
 jstl.jar,\
 geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\
-ant.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\
+ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\
 jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\
 xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\
 dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar,sunmscapi.jar,\
-sunpkcs11.jar,tools.jar,\
+sunpkcs11.jar,jhall.jar,tools.jar,\
 apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar,dns_sd.jar,\
 j3daudio.jar,j3dcore.jar,j3dutils.jar,jai_core.jar,jai_codec.jar,\
 mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar

diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java b/test/org/apache/catalina/startup/TomcatBaseTest.java
index 9344c81..dd72a95 100644 (file)
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -116,17 +116,18 @@ public abstract class TomcatBaseTest extends TestCase {
                 "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-collections*.jar," +
                 "commons-dbcp*.jar,commons-digester*.jar," +
                 "commons-fileupload*.jar,commons-io*.jar," +
                 "commons-logging*.jar,commons-math*.jar,commons-pool*.jar," +
                 "jstl.jar," +
                 "geronimo-spec-jaxrpc*.jar,wsdl4j*.jar," +
-                "ant.jar,jmx.jar,hibernate*.jar,jmx-tools.jar,jta*.jar," +
+                "ant.jar,ant-junit*.jar,jmx.jar,hibernate*.jar,jmx-tools.jar,jta*.jar," +
                 "log4j*.jar,slf4j*.jar" +
                 "xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar," +
                 "dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar," +
-                "sunpkcs11.jar,tools.jar," +
+                "sunpkcs11.jar,jhall.jar,tools.jar," +
                 "apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar," +
                 "dns_sd.jar,j3daudio.jar,j3dcore.jar,j3dutils.jar," +
                 "jai_core.jar,jai_codec.jar," +

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a91eec5..3c5517b 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -69,8 +69,8 @@
         in AccessLogValve. Support logging begin and/or end of request. (rjung)
       </add>
       <update>
-        Add the Tomcat extras JARs to the list of JARs to skip when scanning
-        for TLDs and web fragments. (rjung)
+        Add the Tomcat extras, ant-junit and Java Help Jars to the list of JARs
+        to skip when scanning for TLDs and web fragments. (rjung)
       </update>
       <fix>
         The fix for bug <bug>51310</bug> caused a regression that re-introduced