You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2011/06/23 13:01:02 UTC
svn commit: r1138828 - in /tomcat/trunk:
test/org/apache/catalina/startup/TomcatBaseTest.java
webapps/docs/changelog.xml
Author: rjung
Date: Thu Jun 23 11:01:02 2011
New Revision: 1138828
URL: http://svn.apache.org/viewvc?rev=1138828&view=rev
Log:
Use system properties loaded from catalina.properties
via the class path in unit tests.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/trunk/webapps/docs/changelog.xml
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=1138828&r1=1138827&r2=1138828&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Thu Jun 23 11:01:02 2011
@@ -106,37 +106,8 @@ public abstract class TomcatBaseTest ext
}
System.setProperty("catalina.base", tempDir.getAbsolutePath());
- System.setProperty("tomcat.util.scan.DefaultJarScanner.jarsToSkip",
- "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar," +
- "annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar," +
- "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-collections*.jar," +
- "commons-dbcp*.jar,commons-digester*.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,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," +
- "jai_core.jar,jai_codec.jar," +
- "mlibwrapper_jai.jar,MRJToolkit.jar,vecmath.jar," +
- "junit.jar,junit-*.jar,ant-launcher.jar");
+ // Trigger loading of catalina.properties
+ CatalinaProperties.getProperty("foo");
File appBase = new File(tempDir, "webapps");
if (!appBase.exists() && !appBase.mkdir()) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1138828&r1=1138827&r2=1138828&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 23 11:01:02 2011
@@ -135,6 +135,10 @@
Generate this copy for inclusion in bin and src jars during the
ant "compile" task. (rjung)
</fix>
+ <fix>
+ Use system properties loaded from catalina.properties via the class
+ path in unit tests. (rjung)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org