Author: jmitchell Date: Fri Feb 4 07:45:46 2005 New Revision: 151365 URL: http://svn.apache.org/viewcvs?view=rev&rev=151365 Log: clean up build - remove dependency on collections
Modified: jakarta/commons/proper/resources/trunk/build.xml jakarta/commons/proper/resources/trunk/project.xml Modified: jakarta/commons/proper/resources/trunk/build.xml URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/build.xml?view=diff&r1=151364&r2=151365 ============================================================================== --- jakarta/commons/proper/resources/trunk/build.xml (original) +++ jakarta/commons/proper/resources/trunk/build.xml Fri Feb 4 07:45:46 2005 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!--build.xml generated by maven from project.xml version 1.0-dev - on date July 5 2004, time 1441--> + on date February 4 2005, time 1044--> <project default="jar" name="commons-resources" basedir="."> <property name="defaulttargetdir" value="target"> @@ -22,6 +22,12 @@ </property> <property name="final.name" value="commons-resources-1.0-dev"> </property> + <path id="build.classpath"> + <fileset dir="${libdir}"> + <include name="**/*.jar"> + </include> + </fileset> + </path> <target name="init" description="o Initializes some properties"> <mkdir dir="${libdir}"> </mkdir> @@ -29,6 +35,10 @@ <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> <target name="compile" description="o Compile the code" depends="get-deps"> <mkdir dir="${classesdir}"> @@ -38,38 +48,9 @@ <pathelement location="src/java"> </pathelement> </src> - <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> + <classpath refid="build.classpath"> </classpath> - <!-- Exclude Ibatis related classes because ibiblio does not have the - required (1.2.9) JAR file at the moment --> - <exclude name="org/apache/commons/resources/impl/IBatis*.java"/> </javac> - <copy todir="${classesdir}"> - <fileset dir="."> - <include name="**/*.properties"> - </include> - </fileset> - </copy> - <mkdir dir="${classesdir}/META-INF"> - </mkdir> - <copy todir="${classesdir}/META-INF"> - <fileset dir="."> - <include name="NOTICE.txt"> - </include> - </fileset> - </copy> - <copy todir="${testclassesdir}"> - <fileset dir="src/test"> - <include name="**/*.properties"> - </include> - <include name="**/*.xml"> - </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}"> @@ -95,7 +76,7 @@ <fail message="There were test failures."> </fail> </target> - <target name="internal-test" depends="compile-tests"> + <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"> <mkdir dir="${testreportdir}"> </mkdir> <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true"> @@ -106,10 +87,8 @@ <formatter usefile="false" type="plain"> </formatter> <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> + <path refid="build.classpath"> + </path> <pathelement path="${testclassesdir}"> </pathelement> <pathelement path="${classesdir}"> @@ -119,14 +98,16 @@ <fileset dir="src/test"> <include name="**/*TestCase.java"> </include> - <!-- Exclude Ibatis related classes because ibiblio does not have the - required (1.2.9) JAR file at the moment --> - <exclude name="org/apache/commons/resources/impl/IBatis*.java"/> </fileset> </batchtest> </junit> </target> - <target name="compile-tests" depends="compile"> + <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> + <target name="compile-tests" if="Junit.present" depends="junit-present,compile"> <mkdir dir="${testclassesdir}"> </mkdir> <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> @@ -135,16 +116,11 @@ </pathelement> </src> <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> + <path refid="build.classpath"> + </path> <pathelement path="${classesdir}"> </pathelement> </classpath> - <!-- Exclude Ibatis related classes because ibiblio does not have the - required (1.2.9) JAR file at the moment --> - <exclude name="org/apache/commons/resources/impl/IBatis*.java"/> </javac> <copy todir="${testclassesdir}"> <fileset dir="src/test"> @@ -152,10 +128,12 @@ </include> <include name="**/*.xml"> </include> + <include name="**/*.sql"> + </include> </fileset> </copy> </target> - <target name="javadoc" description="o Generate javadoc"> + <target name="javadoc" description="o Generate javadoc" depends="get-deps"> <mkdir dir="${javadocdir}"> </mkdir> <tstamp> @@ -168,49 +146,31 @@ </property> <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.resources.*"> <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> - <pathelement location="${defaulttargetdir}/${final.name}.jar"> - </pathelement> + <path refid="build.classpath"> + </path> </classpath> </javadoc> </target> <target name="get-deps" unless="noget" depends="init"> - <get dest="${libdir}/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar"> - </get> - <get dest="${libdir}/commons-beanutils-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.5.jar"> - </get> - <get dest="${libdir}/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar"> - </get> - <get dest="${libdir}/commons-digester-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.3.jar"> - </get> - <get dest="${libdir}/commons-discovery-0.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-discovery/jars/commons-discovery-0.1.jar"> - </get> - <get dest="${libdir}/commons-logging-1.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.2.jar"> - </get> + <!--Proxy settings works only with a JDK 1.2 and higher.--> + + <setproxy> + </setproxy> <get dest="${libdir}/servletapi-2.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.3.jar"> </get> - <get dest="${libdir}/hibernate-2.1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/hibernate/jars/hibernate-2.1.3.jar"> - </get> - <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 dest="${libdir}/commons-beanutils-1.7.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.7.0.jar"> </get> - <get dest="${libdir}/dom4j-1.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.4.jar"> + <get dest="${libdir}/commons-digester-1.6.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.6.jar"> </get> - <get dest="${libdir}/cglib-full-2.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/cglib/jars/cglib-full-2.0.jar"> + <get dest="${libdir}/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.4.jar"> </get> - <get dest="${libdir}/oscache-2.0.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/opensymphony/jars/oscache-2.0.1.jar"> - </get> - <get dest="${libdir}/geronimo-spec-jta-1.0-M1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/geronimo-spec/jars/geronimo-spec-jta-1.0-M1.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 dest="${libdir}/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar"> </get> <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}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"> + <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}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"> + <get dest="${libdir}/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jdom/jars/jdom-1.0.jar"> </get> </target> <target name="install-maven"> @@ -219,4 +179,4 @@ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> </unjar> </target> -</project> +</project> \ No newline at end of file Modified: jakarta/commons/proper/resources/trunk/project.xml URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/project.xml?view=diff&r1=151364&r2=151365 ============================================================================== --- jakarta/commons/proper/resources/trunk/project.xml (original) +++ jakarta/commons/proper/resources/trunk/project.xml Fri Feb 4 07:45:46 2005 @@ -116,55 +116,68 @@ <dependencies> + <!-- Standard dependencies --> <dependency> - <id>xml-apis</id> - <version>2.0.2</version> + <groupId>servletapi</groupId> + <artifactId>servletapi</artifactId> + <version>2.3</version> + <url>http://java.sun.com/products/servlet/</url> </dependency> - + <dependency> - <id>commons-beanutils</id> - <version>1.5</version> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + <url>http://jakarta.apache.org/commons/beanutils</url> </dependency> - + <dependency> - <id>commons-collections</id> - <version>2.1</version> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.6</version> + <url>http://jakarta.apache.org/commons/digester</url> </dependency> - + <dependency> - <id>commons-digester</id> - <version>1.3</version> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + <url>http://jakarta.apache.org/commons/logging</url> </dependency> + <dependency> - <id>commons-logging</id> - <version>1.0.2</version> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>2.0.2</version> + <url>http://xml.apache.org/commons/</url> </dependency> + <!-- for testing --> <dependency> - <id>servletapi</id> - <version>2.3</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <url>http://www.junit.org</url> </dependency> - + <dependency> - <id>hsqldb</id> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> <version>1.7.1</version> + <url>http://hsqldb.sourceforge.net/</url> </dependency> - <!-- for testing --> - - <dependency> - <id>junit</id> - <version>3.8.1</version> + <!-- Needed for Testing (iBatis) --> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.0</version> + <url>http://www.jdom.org/</url> </dependency> - <!-- Testing (iBatis) --> - <dependency> - <id>jdom</id> - <version>b10</version> - </dependency> - + </dependencies> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]