henning 2004/10/11 02:53:33
Modified: configuration build.xml
Log:
Make ant based build pass all Unit test for 1.0
Revision Changes Path
1.11 +48 -19 jakarta-commons/configuration/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/configuration/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 6 Sep 2004 11:58:32 -0000 1.10
+++ build.xml 11 Oct 2004 09:53:33 -0000 1.11
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--build.xml generated by maven from project.xml version 1.0-SNAPSHOT
- on date September 3 2004, time 1745-->
+<!--build.xml generated by maven from project.xml version 1.0
+ on date October 11 2004, time 1132-->
<project default="jar" name="commons-configuration" basedir=".">
<property name="defaulttargetdir" value="target">
@@ -20,7 +20,7 @@
</property>
<property name="javadocdir" value="dist/docs/api">
</property>
- <property name="final.name" value="commons-configuration-1.0-SNAPSHOT">
+ <property name="final.name" value="commons-configuration-1.0">
</property>
<path id="build.classpath">
<fileset dir="${libdir}">
@@ -35,8 +35,6 @@
<equals arg2="only" arg1="${build.sysclasspath}">
</equals>
</condition>
- <!--Test if JUNIT is present in ANT classpath-->
-
<available property="Junit.present" classname="junit.framework.Test">
</available>
</target>
@@ -57,6 +55,40 @@
</include>
</fileset>
</copy>
+ <copy todir="${testclassesdir}">
+ <fileset dir="conf">
+ <include name="*.xml">
+ </include>
+ </fileset>
+ </copy>
+ <copy todir="${testclassesdir}">
+ <fileset dir="conf">
+ <include name="testClasspath.properties">
+ </include>
+ <include name="testdb.script">
+ </include>
+ <include name="*.properties">
+ </include>
+ </fileset>
+ </copy>
+ <mkdir dir="${testclassesdir}/org/apache/commons/configuration">
+ </mkdir>
+ <copy todir="${testclassesdir}/org/apache/commons/configuration">
+ <fileset dir="conf">
+ <include name="test.properties">
+ </include>
+ <include name="include.properties">
+ </include>
+ </fileset>
+ </copy>
+ <mkdir dir="${testclassesdir}/config">
+ </mkdir>
+ <copy todir="${testclassesdir}/config">
+ <fileset dir="conf/config">
+ <include name="**/*.properties">
+ </include>
+ </fileset>
+ </copy>
</target>
<target name="jar" description="o Create the jar" depends="compile,test">
<jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html"
basedir="${classesdir}">
@@ -99,6 +131,9 @@
</pathelement>
<pathelement path="${classesdir}">
</pathelement>
+ <fileset dir="conf">
+ <include name="**/*.jar"/>
+ </fileset>
</classpath>
<batchtest todir="${testreportdir}">
<fileset dir="src/test">
@@ -112,12 +147,10 @@
</batchtest>
</junit>
</target>
- <target name="junit-present" unless="Junit.present" depends="init">
- <echo>================================= WARNING
================================</echo>
- <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not
executed.</echo>
-
<echo>==========================================================================</echo>
+ <target name="junit-present" unless="Junit.present" depends="compile-tests">
+ <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not
done.</echo>
</target>
- <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
+ <target name="compile-tests" depends="compile">
<mkdir dir="${testclassesdir}">
</mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
@@ -176,7 +209,7 @@
</tstamp>
<property name="copyright" value="Copyright &copy; The Apache Software
Foundation. All Rights Reserved.">
</property>
- <property name="title" value="Commons Configuration 1.0-SNAPSHOT API">
+ <property name="title" value="Commons Configuration 1.0 API">
</property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.commons.configuration.*">
<classpath>
@@ -186,8 +219,6 @@
</javadoc>
</target>
<target name="get-deps" unless="noget" depends="init">
- <!--Proxy settings works only with a JDK 1.2 and higher.-->
-
<get dest="${libdir}/commons-collections-3.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-3.0.jar";>
</get>
<get dest="${libdir}/commons-lang-2.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-2.0.jar";>
@@ -212,15 +243,13 @@
</get>
<get dest="${libdir}/commons-pool-1.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-pool/jars/commons-pool-1.1.jar";>
</get>
- <get dest="${libdir}/hsqldb-1.7.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/hsqldb/jars/hsqldb-1.7.1.jar";>
- </get>
- <get dest="${libdir}/dbunit-2.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/dbunit/jars/dbunit-2.0.jar";>
+ <get dest="${libdir}/hsqldb-1.7.2.2.jar" usetimestamp="true"
ignoreerrors="true" src="http://www.ibiblio.org/maven/hsqldb/jars/hsqldb-1.7.2.2.jar";>
</get>
- <get dest="${libdir}/junit-addons-1.4.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit-addons/jars/junit-addons-1.4.jar";>
+ <get dest="${libdir}/dbunit-2.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/dbunit/jars/dbunit-2.1.jar";>
</get>
- <get dest="${libdir}/maven-tasks-plugin-1.1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/maven-plugins/plugins/maven-tasks-plugin-1.1.0.jar";>
+ <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";>
</get>
- <get dest="${libdir}/maven-findbugs-plugin-0.8.4.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/maven-plugins/plugins/maven-findbugs-plugin-0.8.4.jar";>
+ <get dest="${libdir}/junit-addons-1.4.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit-addons/jars/junit-addons-1.4.jar";>
</get>
</target>
<target name="install-maven">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
