Author: psteitz Date: Thu Aug 3 23:14:55 2006 New Revision: 428638 URL: http://svn.apache.org/viewvc?rev=428638&view=rev Log: Updated / repaired ant build.
Modified: jakarta/commons/sandbox/id/trunk/build.xml Modified: jakarta/commons/sandbox/id/trunk/build.xml URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/id/trunk/build.xml?rev=428638&r1=428637&r2=428638&view=diff ============================================================================== --- jakarta/commons/sandbox/id/trunk/build.xml (original) +++ jakarta/commons/sandbox/id/trunk/build.xml Thu Aug 3 23:14:55 2006 @@ -1,23 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2003-2004 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!--build.xml generated by maven from project.xml version 0.1-dev - on date September 18 2005, time 1456--> +<!--build.xml generated by maven from project.xml version 0.1-SNAPSHOT + on date August 3 2006, time 2311--> <project default="jar" name="commons-id" basedir="."> <!--Load local and user build preferences--> @@ -42,7 +26,7 @@ </property> <property name="javadocdir" value="${basedir}/dist/docs/api"> </property> - <property name="final.name" value="commons-id-0.1-dev"> + <property name="final.name" value="commons-id-0.1-SNAPSHOT"> </property> <property name="proxy.host" value=""> </property> @@ -53,13 +37,17 @@ <property name="proxy.password" value=""> </property> <path id="build.classpath"> + <pathelement location="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar"> + </pathelement> + <pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar"> + </pathelement> <pathelement location="${libdir}/ant/jars/ant-1.5.3-1.jar"> </pathelement> <pathelement location="${libdir}/junit/jars/junit-3.8.1.jar"> </pathelement> - <pathelement location="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar"> + <pathelement location="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.1.1.jar"> </pathelement> - <pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar"> + <pathelement location="${libdir}/maven/plugins/maven-xdoc-plugin-1.9.2.jar"> </pathelement> </path> <target name="init" description="o Initializes some properties"> @@ -97,12 +85,6 @@ <classpath refid="build.classpath"> </classpath> </javac> - <copy todir="${classesdir}"> - <fileset dir="${basedir}/src/conf"> - <include name="*.state"> - </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}"> @@ -148,7 +130,7 @@ </classpath> <batchtest todir="${testreportdir}"> <fileset dir="${basedir}/src/test"> - <include name="**/*Test*"> + <include name="**/*Test.*"> </include> </fileset> </batchtest> @@ -174,6 +156,12 @@ </pathelement> </classpath> </javac> + <copy todir="${testclassesdir}"> + <fileset dir="${basedir}/src/test-conf"> + <include name="*.state"> + </include> + </fileset> + </copy> </target> <target name="javadoc" description="o Generate javadoc" depends="get-deps"> <mkdir dir="${javadocdir}"> @@ -184,15 +172,39 @@ </tstamp> <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved."> </property> - <property name="title" value="Commons Id 0.1-dev API"> + <property name="title" value="Commons Id 0.1-SNAPSHOT API"> </property> - <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.id.*.*"> + <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.id.*"> <classpath> <path refid="build.classpath"> </path> </classpath> </javadoc> </target> + <target name="get-dep-commons-discovery.jar" description="o Download the dependency : commons-discovery.jar" unless="commons-discovery.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-discovery.jar"> + <mkdir dir="${libdir}/commons-discovery/jars/"> + </mkdir> + <get dest="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-discovery/jars/commons-discovery-0.2.jar"> + </get> + </target> + <target name="get-custom-dep-commons-discovery.jar" if="commons-discovery.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/commons-discovery/jars/"> + </mkdir> + <get dest="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true" src="${commons-discovery.jar}"> + </get> + </target> + <target name="get-dep-commons-logging.jar" description="o Download the dependency : commons-logging.jar" unless="commons-logging.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-logging.jar"> + <mkdir dir="${libdir}/commons-logging/jars/"> + </mkdir> + <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar"> + </get> + </target> + <target name="get-custom-dep-commons-logging.jar" if="commons-logging.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/commons-logging/jars/"> + </mkdir> + <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="${commons-logging.jar}"> + </get> + </target> <target name="get-dep-ant.jar" description="o Download the dependency : ant.jar" unless="ant.jar" depends="init,setProxy,noProxy,get-custom-dep-ant.jar"> <mkdir dir="${libdir}/ant/jars/"> </mkdir> @@ -217,31 +229,31 @@ <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="${junit.jar}"> </get> </target> - <target name="get-dep-commons-discovery.jar" description="o Download the dependency : commons-discovery.jar" unless="commons-discovery.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-discovery.jar"> - <mkdir dir="${libdir}/commons-discovery/jars/"> + <target name="get-dep-maven-cobertura-plugin.jar" description="o Download the dependency : maven-cobertura-plugin.jar" unless="maven-cobertura-plugin.jar" depends="init,setProxy,noProxy,get-custom-dep-maven-cobertura-plugin.jar"> + <mkdir dir="${libdir}/maven-plugins/plugins/"> </mkdir> - <get dest="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-discovery/jars/commons-discovery-0.2.jar"> + <get dest="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.1.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven-plugins/plugins/maven-cobertura-plugin-1.1.1.jar"> </get> </target> - <target name="get-custom-dep-commons-discovery.jar" if="commons-discovery.jar" depends="init,setProxy,noProxy"> - <mkdir dir="${libdir}/commons-discovery/jars/"> + <target name="get-custom-dep-maven-cobertura-plugin.jar" if="maven-cobertura-plugin.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/maven-plugins/plugins/"> </mkdir> - <get dest="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true" src="${commons-discovery.jar}"> + <get dest="${libdir}/maven-plugins/plugins/maven-cobertura-plugin-1.1.1.jar" usetimestamp="true" ignoreerrors="true" src="${maven-cobertura-plugin.jar}"> </get> </target> - <target name="get-dep-commons-logging.jar" description="o Download the dependency : commons-logging.jar" unless="commons-logging.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-logging.jar"> - <mkdir dir="${libdir}/commons-logging/jars/"> + <target name="get-dep-maven-xdoc-plugin.jar" description="o Download the dependency : maven-xdoc-plugin.jar" unless="maven-xdoc-plugin.jar" depends="init,setProxy,noProxy,get-custom-dep-maven-xdoc-plugin.jar"> + <mkdir dir="${libdir}/maven/plugins/"> </mkdir> - <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar"> + <get dest="${libdir}/maven/plugins/maven-xdoc-plugin-1.9.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven/plugins/maven-xdoc-plugin-1.9.2.jar"> </get> </target> - <target name="get-custom-dep-commons-logging.jar" if="commons-logging.jar" depends="init,setProxy,noProxy"> - <mkdir dir="${libdir}/commons-logging/jars/"> + <target name="get-custom-dep-maven-xdoc-plugin.jar" if="maven-xdoc-plugin.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/maven/plugins/"> </mkdir> - <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="${commons-logging.jar}"> + <get dest="${libdir}/maven/plugins/maven-xdoc-plugin-1.9.2.jar" usetimestamp="true" ignoreerrors="true" src="${maven-xdoc-plugin.jar}"> </get> </target> - <target name="get-deps" unless="noget" depends="get-dep-ant.jar,get-dep-junit.jar,get-dep-commons-discovery.jar,get-dep-commons-logging.jar"> + <target name="get-deps" unless="noget" depends="get-dep-commons-discovery.jar,get-dep-commons-logging.jar,get-dep-ant.jar,get-dep-junit.jar,get-dep-maven-cobertura-plugin.jar,get-dep-maven-xdoc-plugin.jar"> </target> <target name="setProxy" if="useProxy" depends="init"> <!--Proxy settings works only with a JDK 1.2 and higher.--> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]