Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

The created jarfiles now have the version# embedded in their names, so the

Browse Source 
test wrapper class can't just hard-wire their names any more. Instead, we
pass the jarfile names in from the build.xml file as system properties.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@191630 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Simon Kitching
2005-06-21 06:21:55 +00:00
parent 0f272fa209
commit 330e17e0ed
2 changed files with 74 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/test/org/apache/commons/logging/Wrapper.java
View File

@@ -82,10 +82,22 @@ public class Wrapper {
// Construct URLs for the various JAR files
File target = new File(System.getProperty("wrapper.target"));
URL commonsLogging =
(new File(target, "commons-logging.jar")).toURL();
URL commonsLoggingApi =
(new File(target, "commons-logging-api.jar")).toURL();
// the test invoker is required to set these system properties
// to point to the appropriate jar files
String jcljar = System.getProperty("commons.logging.jar");
String jclapijar = System.getProperty("commons.logging.api.jar");
String jclappjar = System.getProperty("commons.logging.appenders.jar");
if ((jcljar==null) || (jclapijar==null) || (jclappjar==null)) {
throw new Exception(
"Required system property for test is missing. "
+ "One or more of the following is not defined: "
+ "commons.logging.jar, commons.logging.api.jar, "
+ "commons.logging.appenders.jar");
}
URL commonsLogging = (new File(target, jcljar)).toURL();
URL commonsLoggingApi = (new File(target, jclapijar)).toURL();
URL commonsLoggingTests =
(new File(target, "commons-logging-tests.jar")).toURL();
URL junit =
@@ -96,9 +108,12 @@ public class Wrapper {
log4j =
(new File(System.getProperty("wrapper.log4j"))).toURL();
appender =
(new File(target, "commons-logging-appender.jar")).toURL();
(new File(target, jclappjar)).toURL();
}
System.out.println("commonsLogging lib is at [" + commonsLogging + "]");
System.out.println("commonsLoggingApi lib is at [" + commonsLoggingApi + "]");
// Construct class loader repository lists for supported scenarios
if ("API".equals(System.getProperty("wrapper.hierarchy"))) {
parentList.add(commonsLoggingApi);