jmcnally 02/03/17 22:40:49
Modified: jdbc2pool build.xml default.properties
Log:
changes due to package reorganization from commons-util to commons-lang
added commons-collections as a dependency for use of FastHashMap
added some test properties
Revision Changes Path
1.4 +32 -13 jakarta-commons-sandbox/jdbc2pool/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jdbc2pool/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 4 Mar 2002 07:52:37 -0000 1.3
+++ build.xml 18 Mar 2002 06:40:49 -0000 1.4
@@ -13,7 +13,8 @@
<path id="classpath">
<pathelement location="${jdbc.jar}"/>
<pathelement location="${log4j.jar}"/>
- <pathelement location="${commons-util.jar}"/>
+ <pathelement location="${commons-lang.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-pool.jar}"/>
<pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${junit.jar}"/>
@@ -30,7 +31,8 @@
<echo message="log4j.jar = ${log4j.jar}"/>
<echo message="jdbc.jar = ${jdbc.jar}"/>
<echo message="junit.jar = ${junit.jar}"/>
- <echo message="commons-util.jar = ${commons-util.jar}"/>
+ <echo message="commons-lang.jar = ${commons-lang.jar}"/>
+ <echo message="commons-collections.jar = ${commons-collections.jar}"/>
<echo message="commons-pool.jar = ${commons-pool.jar}"/>
<echo message="commons-dbcp.jar = ${commons-dbcp.jar}"/>
</target>
@@ -60,8 +62,14 @@
/>
<available
- classname="org.apache.commons.util.exception.NestableException"
- property="commons-util.present"
+ classname="org.apache.commons.lang.Objects"
+ property="commons-lang.present"
+ classpathref="classpath"
+ />
+
+ <available
+ classname="org.apache.commons.collections.FastHashMap"
+ property="commons-collections.present"
classpathref="classpath"
/>
@@ -93,12 +101,22 @@
</target>
<target
- name="check.commons-util"
- unless="commons-util.present">
+ name="check.commons-lang"
+ unless="commons-lang.present">
<antcall target="property-warning">
- <param name="name" value="commons-util.jar"/>
- <param name="value" value="${commons-util.jar}"/>
+ <param name="name" value="commons-lang.jar"/>
+ <param name="value" value="${commons-lang.jar}"/>
+ </antcall>
+ </target>
+
+ <target
+ name="check.commons-collections"
+ unless="commons-collections.present">
+
+ <antcall target="property-warning">
+ <param name="name" value="commons-collections.jar"/>
+ <param name="value" value="${commons-collections.jar}"/>
</antcall>
</target>
@@ -136,7 +154,7 @@
<target
name="prepare"
- depends="init,check.log4j,check.commons-util,
+ depends="init,check.log4j,check.commons-lang,check.commons-collections,
check.jdbc,env">
<mkdir dir="${build.dir}"/>
@@ -185,11 +203,12 @@
</javac>
</target>
+
<!-- ================================================================== -->
<!-- T E S T -->
<!-- ================================================================== -->
<target
- name="run-test"
+ name="test"
depends="prepare,compile-test"
if="junit.present"
description="==> runs the test source code">
@@ -200,10 +219,11 @@
<classpath refid="classpath"/>
</taskdef>
- <junit printsummary="no" haltonfailure="yes">
+ <junit printsummary="no" haltonfailure="${test.haltonfailure}">
<classpath>
<pathelement location="${build.dest}"/>
<pathelement location="${build.test}"/>
+ <pathelement location="${build.dbcp}"/>
<path refid="classpath"/>
</classpath>
@@ -211,8 +231,7 @@
<batchtest>
<fileset dir="${test.dir}">
- <exclude name="**/BaseTestCase.java"/>
- <exclude name="**/PoolTest.java"/>
+ <!-- <include name="**/Test*.java"/> -->
<include name="**/*Test.java"/>
</fileset>
</batchtest>
1.4 +9 -4 jakarta-commons-sandbox/jdbc2pool/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jdbc2pool/default.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.properties 4 Mar 2002 07:52:37 -0000 1.3
+++ default.properties 18 Mar 2002 06:40:49 -0000 1.4
@@ -14,10 +14,7 @@
build.dir = ./bin
build.dest = ${build.dir}/classes
-build.test = ${build.dir}/test
src.dir = ./src
-test.dir = ${src.dir}/test
-test.libDir = ${build.test}/lib
dist.home = ./dist
year = 1999-2002
@@ -30,9 +27,17 @@
# order to build Jdbc2pool:
log4j.jar = ${lib.repo}/log4j-1.1.3.jar
-commons-util.jar = ${lib.repo}/commons-util-0.1-dev.jar
+commons-lang.jar = ${lib.repo}/commons-lang-0.1-dev.jar
+commons-collections.jar = ${lib.repo}/commons-collections.jar
commons-pool.jar = ${lib.repo}/commons-pool.jar
commons-dbcp.jar = ${lib.repo}/commons-dbcp.jar
jdbc.jar = ${lib.repo}/jdbc2_0-stdext.jar
junit.jar = ${lib.repo}/junit-3.7.jar
+
+build.test = ${build.dir}/test
+test.dir = ${src.dir}/test
+test.libDir = ${build.test}/lib
+test.haltonfailure=true
+dbcp.home=/home/jmcnally/projects/jakarta/jakarta-commons/dbcp
+build.dbcp=${dbcp.home}/dist/classes
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
