Author: kkolinko
Date: Tue Jun 21 10:17:17 2011
New Revision: 1137931
URL: http://svn.apache.org/viewvc?rev=1137931&view=rev
Log:
Align tomcat.util.scan.DefaultJarScanner.jarsToSkip value in TomcatBaseTest.
Add junit and ant-launcher to the value in catalina.properties
Modified:
tomcat/trunk/conf/catalina.properties
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/conf/catalina.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1137931&r1=1137930&r2=1137931&view=diff
==============================================================================
--- tomcat/trunk/conf/catalina.properties (original)
+++ tomcat/trunk/conf/catalina.properties Tue Jun 21 10:17:17 2011
@@ -106,7 +106,8 @@ dnsns.jar,ldapsec.jar,localedata.jar,sun
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.
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=1137931&r1=1137930&r2=1137931&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Tue Jun
21 10:17:17 2011
@@ -119,20 +119,24 @@ public abstract class TomcatBaseTest ext
"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()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
