Changes due to testcase classes now controlling their own classpaths.
* The Wrapper class is no longer used. * The log4j tests run with log4j13 in the classpath have been removed for now; will implement this via another mechanism in the near future. Note that there are expected to be more cleanups applied to this file in the near future. git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@202473 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Simon Kitching
377
build.xml
377
build.xml
@@ -157,18 +157,23 @@
|
||||
<pathelement location="${log4j12.jar}"/>
|
||||
</path>
|
||||
|
||||
<!-- Construct unit test classpath (Minimal Wrapper) -->
|
||||
<path id="test.classpath.wrap">
|
||||
<pathelement location="${build.home}/commons-logging-wrapper.jar"/>
|
||||
</path>
|
||||
|
||||
<!-- Should all tests fail if one does? -->
|
||||
<property name="test.failonerror" value="true"/>
|
||||
|
||||
<!-- The test runner to execute -->
|
||||
<property name="test.runner" value="junit.textui.TestRunner"/>
|
||||
<property name="test.entry" value="org.apache.commons.logging.TestAll"/>
|
||||
<property name="test.wrapper" value="org.apache.commons.logging.Wrapper"/>
|
||||
|
||||
<!-- libs to pass to the tests -->
|
||||
<property name="test.sysprops.testclasses" value="${build.home}/tests"/>
|
||||
<property name="test.sysprops.log4j12" value="${log4j12.jar}"/>
|
||||
<property name="test.sysprops.log4j13" value="${log4j13.jar}"/>
|
||||
<property name="test.sysprops.commons-logging" value="${build.home}/${core.jar.name}"/>
|
||||
<property name="test.sysprops.commons-logging-api" value="${build.home}/${api.jar.name}"/>
|
||||
<propertyset id="test-lib-props">
|
||||
<propertyref prefix="test.sysprops."/>
|
||||
<mapper type="glob" from="test.sysprops.*" to="*"/>
|
||||
</propertyset>
|
||||
|
||||
<!-- ========== Executable Targets ======================================== -->
|
||||
|
||||
@@ -565,7 +570,7 @@ limitations under the License.-->'>
|
||||
|
||||
|
||||
<target name="test"
|
||||
depends="test.alt-hashtable, log4j12-test-warning, compile.tests,test.jdk14,test.log4j,test.simple,test.avalon,test.log4j12"
|
||||
depends="test.alt-hashtable, log4j12-test-warning, compile.tests,test.jdk14,test.simple,test.avalon,test.log4j"
|
||||
if="test.entry"
|
||||
description="Run all unit test cases">
|
||||
<java classname="${test.runner}" fork="yes"
|
||||
@@ -576,6 +581,17 @@ limitations under the License.-->'>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="test.pathable" depends="compile.tests"
|
||||
description="Run unit tests specific to Pathable support classes">
|
||||
|
||||
<echo message="Pathable tests..."/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.pathable.PathableTestCase"/>
|
||||
<classpath refid="test.classpath.jdk14"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
</target>
|
||||
|
||||
<target name="test.jdk14" depends="compile.tests" if="jdk.1.4.present"
|
||||
description="Run unit tests specific to JDK 1.4 logging">
|
||||
|
||||
@@ -583,6 +599,7 @@ limitations under the License.-->'>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.jdk14.DefaultConfigTestCase"/>
|
||||
<classpath refid="test.classpath.jdk14"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Default Configuration (JDK 1.4 LogFactoryImpl Selected)"/>
|
||||
@@ -591,6 +608,7 @@ limitations under the License.-->'>
|
||||
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
|
||||
<arg value="org.apache.commons.logging.jdk14.DefaultConfigTestCase"/>
|
||||
<classpath refid="test.classpath.jdk14"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Default Configuration (JDK 1.4 Jdk14Logger Selected)"/>
|
||||
@@ -599,12 +617,14 @@ limitations under the License.-->'>
|
||||
value="org.apache.commons.logging.impl.Jdk14Logger"/>
|
||||
<arg value="org.apache.commons.logging.jdk14.DefaultConfigTestCase"/>
|
||||
<classpath refid="test.classpath.jdk14"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Custom Configuration (JDK 1.4 Auto-Recognized)"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
|
||||
<classpath refid="test.classpath.jdk14"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Custom Configuration (JDK 1.4 LogFactoryImpl Selected)"/>
|
||||
@@ -613,6 +633,7 @@ limitations under the License.-->'>
|
||||
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
|
||||
<arg value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
|
||||
<classpath refid="test.classpath.jdk14"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Custom Configuration (JDK 1.4 Jdk14Logger Selected)"/>
|
||||
@@ -633,89 +654,57 @@ limitations under the License.-->'>
|
||||
|
||||
|
||||
<echo message="Hierarchy Configuration API (JDK 1.4 Auto-Recognized)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="API"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<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 classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.jdk14.CustomConfigAPITestCase"/>
|
||||
<classpath refid="test.classpath.jdk14"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Hierarchy Configuration API (JDK 1.4 LogFactoryImpl Selected)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="API"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.target" value="${build.home}"/>
|
||||
<sysproperty key="wrapper.testcase"
|
||||
value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.jdk14.CustomConfigAPITestCase"/>
|
||||
<classpath refid="test.classpath.jdk14"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
|
||||
<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>
|
||||
|
||||
<echo message="Hierarchy Configuration API (JDK 1.4 Jdk14Logger Selected)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="API"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.target" value="${build.home}"/>
|
||||
<sysproperty key="wrapper.testcase"
|
||||
value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.jdk14.CustomConfigAPITestCase"/>
|
||||
<classpath refid="test.classpath.jdk14"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
|
||||
<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>
|
||||
|
||||
<echo message="Hierarchy Configuration FULL (JDK 1.4 Auto-Recognized)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="FULL"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<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 classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.jdk14.CustomConfigFullTestCase"/>
|
||||
<classpath refid="test.classpath.jdk14"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Hierarchy Configuration FULL (JDK 1.4 LogFactoryImpl Selected)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="FULL"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.target" value="${build.home}"/>
|
||||
<sysproperty key="wrapper.testcase"
|
||||
value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.jdk14.CustomConfigFullTestCase"/>
|
||||
<classpath refid="test.classpath.jdk14"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
|
||||
<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>
|
||||
|
||||
<echo message="Hierarchy Configuration FULL (JDK 1.4 Jdk14Logger Selected)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="FULL"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.target" value="${build.home}"/>
|
||||
<sysproperty key="wrapper.testcase"
|
||||
value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.jdk14.CustomConfigFullTestCase"/>
|
||||
<classpath refid="test.classpath.jdk14"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
|
||||
<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>
|
||||
|
||||
</target>
|
||||
@@ -728,6 +717,7 @@ limitations under the License.-->'>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.log4j.DefaultConfigTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Default Configuration (Log4J LogFactoryImpl Selected)"/>
|
||||
@@ -736,6 +726,7 @@ limitations under the License.-->'>
|
||||
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
|
||||
<arg value="org.apache.commons.logging.log4j.DefaultConfigTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Default Configuration (Log4J Log4J12Logger Selected)"/>
|
||||
@@ -744,12 +735,14 @@ limitations under the License.-->'>
|
||||
value="org.apache.commons.logging.impl.Log4J12Logger"/>
|
||||
<arg value="org.apache.commons.logging.log4j.DefaultConfigTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Custom Configuration (Log4J Auto-Recognized)"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Custom Configuration (Log4J LogFactoryImpl Selected)"/>
|
||||
@@ -758,6 +751,7 @@ limitations under the License.-->'>
|
||||
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
|
||||
<arg value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Custom Configuration (Log4J Log4J12Logger Selected)"/>
|
||||
@@ -766,6 +760,7 @@ limitations under the License.-->'>
|
||||
value="org.apache.commons.logging.impl.Log4J12Logger"/>
|
||||
<arg value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Basic Operations"/>
|
||||
@@ -774,98 +769,62 @@ limitations under the License.-->'>
|
||||
value="org.apache.commons.logging.impl.Log4J12Logger"/>
|
||||
<arg value="org.apache.commons.logging.BasicOperationsTest"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Hierarchy Configuration API (Log4J Auto-Recognized)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="API"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.log4j" value="${log4j12.jar}"/>
|
||||
<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 classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.log4j.CustomConfigAPITestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Hierarchy Configuration API (Log4J LogFactoryImpl Selected)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="API"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.log4j" value="${log4j12.jar}"/>
|
||||
<sysproperty key="wrapper.target" value="${build.home}"/>
|
||||
<sysproperty key="wrapper.testcase"
|
||||
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.log4j.CustomConfigAPITestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
|
||||
|
||||
<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>
|
||||
|
||||
<echo message="Hierarchy Configuration API (Log4J Log4J12Logger Selected)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="API"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.log4j" value="${log4j12.jar}"/>
|
||||
<sysproperty key="wrapper.target" value="${build.home}"/>
|
||||
<sysproperty key="wrapper.testcase"
|
||||
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.log4j.CustomConfigAPITestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
|
||||
<sysproperty key="org.apache.commons.logging.Log"
|
||||
value="org.apache.commons.logging.impl.Log4J12Logger"/>
|
||||
<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>
|
||||
|
||||
<echo message="Hierarchy Configuration FULL (Log4J Auto-Recognized)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="FULL"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.log4j" value="${log4j12.jar}"/>
|
||||
<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 classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.log4j.CustomConfigFullTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
</java>
|
||||
|
||||
<echo message="Hierarchy Configuration FULL (Log4J LogFactoryImpl Selected)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="FULL"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.log4j" value="${log4j12.jar}"/>
|
||||
<sysproperty key="wrapper.target" value="${build.home}"/>
|
||||
<sysproperty key="wrapper.testcase"
|
||||
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.log4j.CustomConfigFullTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
|
||||
<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>
|
||||
|
||||
<echo message="Hierarchy Configuration FULL (Log4J Log4J12Logger Selected)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="FULL"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.log4j" value="${log4j12.jar}"/>
|
||||
<sysproperty key="wrapper.target" value="${build.home}"/>
|
||||
<sysproperty key="wrapper.testcase"
|
||||
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.log4j.CustomConfigFullTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
|
||||
<sysproperty key="org.apache.commons.logging.Log"
|
||||
value="org.apache.commons.logging.impl.Log4J12Logger"/>
|
||||
<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>
|
||||
|
||||
</target>
|
||||
@@ -928,158 +887,6 @@ limitations under the License.-->'>
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
<target name="test.log4j12" depends="compile.tests" if="log4j12.jar"
|
||||
description="Run unit tests specific to Log4J logging Version 1.2">
|
||||
|
||||
<echo message="Default Configuration (Log4J Auto-Recognized)"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.log4j.DefaultConfigTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
</java>
|
||||
|
||||
<echo message="Default Configuration (Log4J LogFactoryImpl Selected)"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="org.apache.commons.logging.LogFactory"
|
||||
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
|
||||
<arg value="org.apache.commons.logging.log4j.DefaultConfigTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
</java>
|
||||
|
||||
<echo message="Default Configuration (Log4J Log4J12Logger Selected)"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="org.apache.commons.logging.Log"
|
||||
value="org.apache.commons.logging.impl.Log4J12Logger"/>
|
||||
<arg value="org.apache.commons.logging.log4j.DefaultConfigTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
</java>
|
||||
|
||||
<echo message="Custom Configuration (Log4J Auto-Recognized)"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<arg value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
</java>
|
||||
|
||||
<echo message="Custom Configuration (Log4J LogFactoryImpl Selected)"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="org.apache.commons.logging.LogFactory"
|
||||
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
|
||||
<arg value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
</java>
|
||||
|
||||
<echo message="Custom Configuration (Log4J Log4J12Logger Selected)"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="org.apache.commons.logging.Log"
|
||||
value="org.apache.commons.logging.impl.Log4J12Logger"/>
|
||||
<arg value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
</java>
|
||||
|
||||
<echo message="Basic Operations"/>
|
||||
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="org.apache.commons.logging.Log"
|
||||
value="org.apache.commons.logging.impl.Log4J12Logger"/>
|
||||
<arg value="org.apache.commons.logging.BasicOperationsTest"/>
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
</java>
|
||||
|
||||
<echo message="Hierarchy Configuration API (Log4J Auto-Recognized)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="API"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.log4j" value="${log4j12.jar}"/>
|
||||
<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>
|
||||
|
||||
<echo message="Hierarchy Configuration API (Log4J LogFactoryImpl Selected)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="API"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.log4j" value="${log4j12.jar}"/>
|
||||
<sysproperty key="wrapper.target" value="${build.home}"/>
|
||||
<sysproperty key="wrapper.testcase"
|
||||
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>
|
||||
|
||||
<echo message="Hierarchy Configuration API (Log4J Log4J12Logger Selected)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="API"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.log4j" value="${log4j12.jar}"/>
|
||||
<sysproperty key="wrapper.target" value="${build.home}"/>
|
||||
<sysproperty key="wrapper.testcase"
|
||||
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
|
||||
<sysproperty key="org.apache.commons.logging.Log"
|
||||
value="org.apache.commons.logging.impl.Log4J12Logger"/>
|
||||
<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>
|
||||
|
||||
<echo message="Hierarchy Configuration FULL (Log4J Auto-Recognized)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="FULL"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.log4j" value="${log4j12.jar}"/>
|
||||
<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>
|
||||
|
||||
<echo message="Hierarchy Configuration FULL (Log4J LogFactoryImpl Selected)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="FULL"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.log4j" value="${log4j12.jar}"/>
|
||||
<sysproperty key="wrapper.target" value="${build.home}"/>
|
||||
<sysproperty key="wrapper.testcase"
|
||||
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>
|
||||
|
||||
<echo message="Hierarchy Configuration FULL (Log4J Log4J12Logger Selected)"/>
|
||||
<java classname="${test.wrapper}" fork="yes" failonerror="${test.failonerror}">
|
||||
<sysproperty key="wrapper.hierarchy" value="FULL"/>
|
||||
<sysproperty key="wrapper.junit" value="${junit.jar}"/>
|
||||
<sysproperty key="wrapper.log4j" value="${log4j12.jar}"/>
|
||||
<sysproperty key="wrapper.target" value="${build.home}"/>
|
||||
<sysproperty key="wrapper.testcase"
|
||||
value="org.apache.commons.logging.log4j.CustomConfigTestCase"/>
|
||||
<sysproperty key="org.apache.commons.logging.Log"
|
||||
value="org.apache.commons.logging.impl.Log4J12Logger"/>
|
||||
<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>
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
|
||||
<target name="test.alt-hashtable" depends="compile.tests"
|
||||
description="Tests for hashtable substitution">
|
||||
|
||||
|
||||
Reference in New Issue
Block a user