You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sk...@apache.org on 2005/06/21 08:21:56 UTC
svn commit: r191630 - in /jakarta/commons/proper/logging/trunk: build.xml
src/test/org/apache/commons/logging/Wrapper.java
Author: skitching
Date: Mon Jun 20 23:21:55 2005
New Revision: 191630
URL: http://svn.apache.org/viewcvs?rev=191630&view=rev
Log:
The created jarfiles now have the version# embedded in their names, so the
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.
Modified:
jakarta/commons/proper/logging/trunk/build.xml
jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/Wrapper.java
Modified: jakarta/commons/proper/logging/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/trunk/build.xml?rev=191630&r1=191629&r2=191630&view=diff
==============================================================================
--- jakarta/commons/proper/logging/trunk/build.xml (original)
+++ jakarta/commons/proper/logging/trunk/build.xml Mon Jun 20 23:21:55 2005
@@ -578,6 +578,9 @@
<sysproperty key="wrapper.target" value="${build.home}"/>
<sysproperty key="wrapper.testcase"
value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -590,6 +593,9 @@
value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
<sysproperty key="org.apache.commons.logging.LogFactory"
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -602,6 +608,9 @@
value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.Jdk14Logger"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -612,6 +621,9 @@
<sysproperty key="wrapper.target" value="${build.home}"/>
<sysproperty key="wrapper.testcase"
value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -624,6 +636,9 @@
value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
<sysproperty key="org.apache.commons.logging.LogFactory"
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -636,6 +651,9 @@
value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.Jdk14Logger"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -705,6 +723,9 @@
<sysproperty key="wrapper.target" value="${build.home}"/>
<sysproperty key="wrapper.testcase"
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -718,6 +739,9 @@
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
<sysproperty key="org.apache.commons.logging.LogFactory"
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -731,6 +755,9 @@
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.Log4JLogger"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -742,6 +769,9 @@
<sysproperty key="wrapper.target" value="${build.home}"/>
<sysproperty key="wrapper.testcase"
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -755,6 +785,9 @@
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
<sysproperty key="org.apache.commons.logging.LogFactory"
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -768,6 +801,9 @@
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.Log4JLogger"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -895,6 +931,9 @@
<sysproperty key="wrapper.target" value="${build.home}"/>
<sysproperty key="wrapper.testcase"
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -908,6 +947,9 @@
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
<sysproperty key="org.apache.commons.logging.LogFactory"
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -921,6 +963,9 @@
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.Log4JLogger"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -932,6 +977,9 @@
<sysproperty key="wrapper.target" value="${build.home}"/>
<sysproperty key="wrapper.testcase"
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -945,6 +993,9 @@
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
<sysproperty key="org.apache.commons.logging.LogFactory"
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
@@ -958,6 +1009,9 @@
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.Log4JLogger"/>
+ <sysproperty key="commons.logging.jar" value="${core.jar.name}"/>
+ <sysproperty key="commons.logging.api.jar" value="${api.jar.name}"/>
+ <sysproperty key="commons.logging.appenders.jar" value="${appenders.jar.name}"/>
<classpath refid="test.classpath.wrap"/>
</java>
Modified: jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/Wrapper.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/Wrapper.java?rev=191630&r1=191629&r2=191630&view=diff
==============================================================================
--- jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/Wrapper.java (original)
+++ jakarta/commons/proper/logging/trunk/src/test/org/apache/commons/logging/Wrapper.java Mon Jun 20 23:21:55 2005
@@ -82,10 +82,22 @@
// 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 @@
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org