Align tomcat.util.scan.DefaultJarScanner.jarsToSkip value in TomcatBaseTest.

Add junit and ant-launcher to the value in catalina.properties

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

diff --git a/conf/catalina.properties b/conf/catalina.properties
index 918bbcc..8c84d44 100644 (file)
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
@@ -106,7 +106,8 @@ dnsns.jar,ldapsec.jar,localedata.jar,sunjce_provider.jar,sunmscapi.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
+mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar,\
+junit.jar,junit-*.jar,ant-launcher.jar
 
 #
 # String cache configuration.

diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java b/test/org/apache/catalina/startup/TomcatBaseTest.java
index dd72a95..fed204f 100644 (file)
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -119,20 +119,24 @@ public abstract class TomcatBaseTest extends TestCase {
                 "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," +
+                "commons-fileupload*.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,ant-junit*.jar,jmx.jar,hibernate*.jar,jmx-tools.jar,jta*.jar," +
-                "log4j*.jar,slf4j*.jar" +
+                "ant.jar,ant-junit*.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,jhall.jar,tools.jar," +
                 "apple_provider.jar,AppleScriptEngine.jar,CoreAudio.jar," +
-                "dns_sd.jar,j3daudio.jar,j3dcore.jar,j3dutils.jar," +
+                "dns_sd.jar," +
+                "j3daudio.jar,j3dcore.jar,j3dutils.jar," +
                 "jai_core.jar,jai_codec.jar," +
                 "mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar," +
-                "junit.jar,ant-launcher.jar,ant-junit.jar");
+                "junit.jar,junit-*.jar,ant-launcher.jar");
         
         File appBase = new File(tempDir, "webapps");
         if (!appBase.exists() && !appBase.mkdir()) {