Author: carnold
Date: Wed Jun 20 21:59:55 2007
New Revision: 549369
URL: http://svn.apache.org/viewvc?view=rev&rev=549369
Log:
Bug 42094: Switch back to junit 3.8.1 for pre-JDK 5, support testing existing
jars
Modified:
logging/log4j/companions/component/trunk/build.xml
logging/log4j/companions/component/trunk/pom.xml
logging/log4j/companions/component/trunk/src/changes/changes.xml
Modified: logging/log4j/companions/component/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/build.xml?view=diff&rev=549369&r1=549368&r2=549369
==============================================================================
--- logging/log4j/companions/component/trunk/build.xml (original)
+++ logging/log4j/companions/component/trunk/build.xml Wed Jun 20 21:59:55 2007
@@ -21,6 +21,8 @@
This is a minimal build file to support Gump.
Use of Maven to build this component is recommended.
+Specify -Dcompanion.jar=foo.jar to test an previously prepared jar.
+
-->
<project default="test">
<!-- use build.properties file or command line to override these
properties -->
@@ -37,7 +39,7 @@
<!-- Versions for dependencies -->
<property name="log4j.version" value="1.2.8"/>
- <property name="junit.version" value="4.3.1"/>
+ <property name="junit.version" value="3.8.1"/>
<!-- Dependency locations - assumed to be in Maven 2 repository -->
<property name="junit.jar"
@@ -58,7 +60,7 @@
</target>
- <target name="compile" depends="init" description="Compile implementation
files">
+ <target name="compile" depends="init" unless="companion.jar"
description="Compile implementation files">
<mkdir dir="target/classes"/>
<javac destdir="target/classes"
srcdir="src/main/java"
@@ -72,7 +74,7 @@
</copy>
</target>
- <target name="jar" depends="compile" description="Create jar">
+ <target name="jar" depends="compile" unless="companion.jar"
description="Create jar">
<jar destfile="target/${project.jar}"
basedir="target/classes">
<manifest>
@@ -86,7 +88,8 @@
</jar>
</target>
- <target name="test-compile" depends="compile" description="Compile test
files">
+ <target name="test-compile" depends="jar" description="Compile test files">
+ <property name="companion.jar" value="target/${project.jar}"/>
<mkdir dir="target/test-classes"/>
<javac destdir="target/test-classes"
srcdir="src/test/java"
@@ -94,7 +97,7 @@
debug="${javac.debug}"
target="${javac.target}"
source="${javac.source}"
- classpath="${log4j.jar}:${junit.jar}:target/classes"/>
+ classpath="${log4j.jar}:${junit.jar}:${companion.jar}"/>
<copy todir="target/test-classes" overwrite="true">
<fileset dir="src/test/resources"/>
</copy>
@@ -103,7 +106,7 @@
<target name="test" depends="test-compile" description="Run unit tests">
<junit printsummary="yes" fork="true" dir="target">
- <classpath path="target/test-classes:target/classes:${log4j.jar}"/>
+ <classpath
path="target/test-classes:${companion.jar}:${log4j.jar}"/>
<batchtest>
<fileset dir="src/test/java/">
<include name="**/*TestCase.java"/>
Modified: logging/log4j/companions/component/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/pom.xml?view=diff&rev=549369&r1=549368&r2=549369
==============================================================================
--- logging/log4j/companions/component/trunk/pom.xml (original)
+++ logging/log4j/companions/component/trunk/pom.xml Wed Jun 20 21:59:55 2007
@@ -175,7 +175,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.3.1</version>
+ <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: logging/log4j/companions/component/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/changes/changes.xml?view=diff&rev=549369&r1=549368&r2=549369
==============================================================================
--- logging/log4j/companions/component/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/component/trunk/src/changes/changes.xml Wed Jun 20
21:59:55 2007
@@ -20,7 +20,7 @@
<title>Component</title>
</properties>
<body>
- <release version="1.0" date="2007-06-05" description="Initial release">
+ <release version="1.0" date="2007-06-21" description="Initial release">
<action issue="42094" type="add">
Initial release of Component framework backported from log4j 1.3.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
