Author: rjung Date: Mon Jun 20 19:44:04 2011 New Revision: 1137754 URL: http://svn.apache.org/viewvc?rev=1137754&view=rev Log: More Jars to skip: ant-junit and Java Help.
Modified: tomcat/trunk/conf/catalina.properties tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/conf/catalina.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1137754&r1=1137753&r2=1137754&view=diff ============================================================================== --- tomcat/trunk/conf/catalina.properties (original) +++ tomcat/trunk/conf/catalina.properties Mon Jun 20 19:44:04 2011 @@ -99,11 +99,11 @@ commons-httpclient*.jar,commons-io*.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 Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1137754&r1=1137753&r2=1137754&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Mon Jun 20 19:44:04 2011 @@ -116,17 +116,18 @@ public abstract class TomcatBaseTest ext "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," + Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1137754&r1=1137753&r2=1137754&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Jun 20 19:44:04 2011 @@ -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 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org