rwaldhoff 01/04/03 22:36:44
Modified: dbcp build.xml build.properties.sample
Log:
making dependency on JUnit jar explict
added sax2.jar to classpath (for JOCL classes)
using <java> rather than <junit> to invoke tests
Revision Changes Path
1.2 +24 -11 jakarta-commons-sandbox/dbcp/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/dbcp/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/04/03 17:27:53 1.1
+++ build.xml 2001/04/04 05:36:43 1.2
@@ -1,4 +1,4 @@
-<!-- $Id: build.xml,v 1.1 2001/04/03 17:27:53 rwaldhoff Exp $ -->
+<!-- $Id: build.xml,v 1.2 2001/04/04 05:36:43 rwaldhoff Exp $ -->
<project name="jakarta-commons-dbcp" default="test" basedir=".">
<!-- patternset describing files to be copied from the doc directory -->
@@ -37,13 +37,15 @@
<property name="cp" value=""/>
<!-- now combine the classpaths -->
- <property name="classpath"
value="${cp}:${user-classpath}:${commons-pool.jar}:${commons-collections.jar}:${commons-jocl.jar}:${j2ee.jar}"/>
+ <property name="classpath"
value="${cp}:${user-classpath}:${commons-pool.jar}:${commons-collections.jar}:${j2ee.jar}:${sax2.jar}:${junit.jar}"/>
<property name="name" value="commons-dbcp"/>
<property name="Name" value="Commons-DBCP"/>
<property name="Name-Long" value="Jakarta Commons Database Connection Pool"/>
<property name="test.entry" value="org.apache.commons.dbcp.TestAll"/>
+ <property name="test.failonerror" value="true" />
+ <property name="test.runner" value="junit.textui.TestRunner" />
<property name="workdir"
value="${java.io.tmpdir}/buildtemp_${DSTAMP}${TSTAMP}"/>
<property name="source" value="${basedir}"/>
@@ -165,17 +167,28 @@
<!-- ######################################################### -->
<target name="test" depends="build" if="test.entry" description="runs (junit)
unit tests">
+ <!--
<junit printsummary="yes" fork="on" haltonfailure="yes">
- <formatter type="plain" usefile="false"/>
- <test name="${test.entry}"/>
- <classpath>
- <pathelement location="${dest.classes}" />
- <pathelement path="${classpath}" />
- <pathelement path="${java.class.path}" />
- </classpath>
+ <formatter type="plain" usefile="false"/>
+ <test name="${test.entry}"/>
+ <classpath>
+ <pathelement location="${dest.classes}" />
+ <pathelement path="${classpath}" />
+ <pathelement path="${java.class.path}" />
+ </classpath>
</junit>
+ -->
+
+ <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
+ <arg value="${test.entry}"/>
+ <classpath>
+ <pathelement location="${dest.classes}" />
+ <pathelement path="${classpath}" />
+ <pathelement path="${java.class.path}" />
+ </classpath>
+ </java>
</target>
-
+
<!-- ######################################################### -->
<target name="dist" depends="dist-jar" description="builds production jar"/>
@@ -196,4 +209,4 @@
<!-- ######################################################### -->
-</project>
+</project>
\ No newline at end of file
1.2 +2 -2 jakarta-commons-sandbox/dbcp/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/dbcp/build.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.sample 2001/04/03 17:27:52 1.1
+++ build.properties.sample 2001/04/04 05:36:44 1.2
@@ -6,5 +6,5 @@
sax2.jar=/cvs/bcom/bcom/stable/ext/lib/sax2.jar
# j2ee.jar - J2EE Classpath
j2ee.jar=/cvs/bcom/bcom/stable/ext/lib/j2ee.jar
-
-
+# junit.jar - JUnit 3.2+ Classpath
+junit.jar=/java/junit/junit.jar
