You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ba...@apache.org on 2007/09/05 11:20:21 UTC
svn commit: r572915 - /commons/proper/fileupload/trunk/build.xml
Author: bayard
Date: Wed Sep 5 02:20:21 2007
New Revision: 572915
URL: http://svn.apache.org/viewvc?rev=572915&view=rev
Log:
Updating build.xml from project.xml so ant build works
Modified:
commons/proper/fileupload/trunk/build.xml
Modified: commons/proper/fileupload/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/build.xml?rev=572915&r1=572914&r2=572915&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/build.xml (original)
+++ commons/proper/fileupload/trunk/build.xml Wed Sep 5 02:20:21 2007
@@ -1,32 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--build.xml generated by maven from project.xml version 1.3-SNAPSHOT
- on date March 16 2007, time 1226-->
+ on date September 5 2007, time 1015-->
<project default="jar" name="commons-fileupload" basedir=".">
- <property name="defaulttargetdir" value="target">
+ <!--Load local and user build preferences-->
+
+ <property file="build.properties">
+ </property>
+ <property file="${user.home}/build.properties">
</property>
- <property name="libdir" value="target/lib">
+ <!--Build properties-->
+
+ <property name="defaulttargetdir" value="${basedir}/target">
</property>
- <property name="classesdir" value="target/classes">
+ <property name="libdir" value="${user.home}/.maven/repository">
</property>
- <property name="testclassesdir" value="target/test-classes">
+ <property name="classesdir" value="${basedir}/target/classes">
</property>
- <property name="testclassesdir" value="target/test-classes">
+ <property name="testclassesdir" value="${basedir}/target/test-classes">
</property>
- <property name="testreportdir" value="target/test-reports">
+ <property name="testreportdir" value="${basedir}/target/test-reports">
</property>
- <property name="distdir" value="dist">
+ <property name="distdir" value="${basedir}/dist">
</property>
- <property name="javadocdir" value="dist/docs/api">
+ <property name="javadocdir" value="${basedir}/dist/docs/api">
</property>
<property name="final.name" value="commons-fileupload-1.3-SNAPSHOT">
</property>
+ <property name="proxy.host" value="">
+ </property>
+ <property name="proxy.port" value="">
+ </property>
+ <property name="proxy.username" value="">
+ </property>
+ <property name="proxy.password" value="">
+ </property>
<path id="build.classpath">
- <fileset dir="${libdir}">
- <include name="**/*.jar">
- </include>
- </fileset>
+ <pathelement location="${libdir}/commons-io/jars/commons-io-1.4-SNAPSHOT.jar">
+ </pathelement>
+ <pathelement location="${libdir}/javax.servlet/jars/servlet-api-2.4.jar">
+ </pathelement>
+ <pathelement location="${libdir}/javax.portlet/jars/portlet-api-1.0.jar">
+ </pathelement>
+ <pathelement location="${libdir}/junit/jars/junit-3.8.1.jar">
+ </pathelement>
+ <pathelement location="${libdir}/maven/plugins/maven-xdoc-plugin-1.9.2.jar">
+ </pathelement>
+ <pathelement location="${libdir}/maven/plugins/maven-changelog-plugin-1.9.1.jar">
+ </pathelement>
</path>
<target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}">
@@ -39,13 +61,25 @@
<available property="Junit.present" classname="junit.framework.Test">
</available>
+ <!--Test if user defined a proxy-->
+
+ <condition property="useProxy">
+ <and>
+ <isset property="proxy.host">
+ </isset>
+ <not>
+ <equals trim="true" arg2="" arg1="${proxy.host}">
+ </equals>
+ </not>
+ </and>
+ </condition>
</target>
<target name="compile" description="o Compile the code" depends="get-deps">
<mkdir dir="${classesdir}">
</mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src>
- <pathelement location="src/java">
+ <pathelement location="${basedir}/src/java">
</pathelement>
</src>
<classpath refid="build.classpath">
@@ -54,7 +88,7 @@
<mkdir dir="${classesdir}/META-INF">
</mkdir>
<copy todir="${classesdir}/META-INF">
- <fileset dir=".">
+ <fileset dir="${basedir}/.">
<include name="NOTICE.txt">
</include>
</fileset>
@@ -87,7 +121,7 @@
<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">
+ <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
<sysproperty key="basedir" value=".">
</sysproperty>
<formatter type="xml">
@@ -103,7 +137,7 @@
</pathelement>
</classpath>
<batchtest todir="${testreportdir}">
- <fileset dir="src/test">
+ <fileset dir="${basedir}/src/test">
<include name="**/*Test.java">
</include>
</fileset>
@@ -120,7 +154,7 @@
</mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src>
- <pathelement location="src/test">
+ <pathelement location="${basedir}/src/test">
</pathelement>
</src>
<classpath>
@@ -131,7 +165,7 @@
</classpath>
</javac>
<copy todir="${testclassesdir}">
- <fileset dir="src/test">
+ <fileset dir="${basedir}/src/test">
<include name="**/*.xml">
</include>
</fileset>
@@ -148,30 +182,111 @@
</property>
<property name="title" value="FileUpload 1.3-SNAPSHOT API">
</property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.fileupload.*">
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.fileupload.*">
<classpath>
<path refid="build.classpath">
</path>
</classpath>
</javadoc>
</target>
- <target name="get-deps" unless="noget" depends="init">
- <!--Proxy settings works only with a JDK 1.2 and higher.-->
-
- <setproxy proxyport="8080" proxyhost="httpprox.hq.sag">
- </setproxy>
- <get dest="${libdir}/commons-io-1.4-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/commons-io/jars/commons-io-1.4-SNAPSHOT.jar">
+ <target name="get-dep-commons-io.jar" description="o Download the dependency : commons-io.jar" unless="commons-io.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-io.jar">
+ <mkdir dir="${libdir}/commons-io/jars/">
+ </mkdir>
+ <get dest="${libdir}/commons-io/jars/commons-io-1.4-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/commons-io/jars/commons-io-1.4-SNAPSHOT.jar">
</get>
- <get dest="${libdir}/servlet-api-2.3.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/javax.servlet/jars/servlet-api-2.3.jar">
+ <get dest="${libdir}/commons-io/jars/commons-io-1.4-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://people.apache.org/repo/m1-snapshot-repository/commons-io/jars/commons-io-1.4-SNAPSHOT.jar">
</get>
- <get dest="${libdir}/portlet-api-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/javax.portlet/jars/portlet-api-1.0.jar">
+ </target>
+ <target name="get-custom-dep-commons-io.jar" if="commons-io.jar" depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/commons-io/jars/">
+ </mkdir>
+ <get dest="${libdir}/commons-io/jars/commons-io-1.4-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="${commons-io.jar}">
</get>
- <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/junit/jars/junit-3.8.1.jar">
+ </target>
+ <target name="get-dep-servlet-api.jar" description="o Download the dependency : servlet-api.jar" unless="servlet-api.jar" depends="init,setProxy,noProxy,get-custom-dep-servlet-api.jar">
+ <mkdir dir="${libdir}/javax.servlet/jars/">
+ </mkdir>
+ <get dest="${libdir}/javax.servlet/jars/servlet-api-2.4.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/javax.servlet/jars/servlet-api-2.4.jar">
</get>
- <get dest="${libdir}/maven-xdoc-plugin-1.9.2.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven/plugins/maven-xdoc-plugin-1.9.2.jar">
+ <get dest="${libdir}/javax.servlet/jars/servlet-api-2.4.jar" usetimestamp="true" ignoreerrors="true" src="http://people.apache.org/repo/m1-snapshot-repository/javax.servlet/jars/servlet-api-2.4.jar">
</get>
- <get dest="${libdir}/maven-changelog-plugin-1.9.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven/plugins/maven-changelog-plugin-1.9.1.jar">
+ </target>
+ <target name="get-custom-dep-servlet-api.jar" if="servlet-api.jar" depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/javax.servlet/jars/">
+ </mkdir>
+ <get dest="${libdir}/javax.servlet/jars/servlet-api-2.4.jar" usetimestamp="true" ignoreerrors="true" src="${servlet-api.jar}">
</get>
+ </target>
+ <target name="get-dep-portlet-api.jar" description="o Download the dependency : portlet-api.jar" unless="portlet-api.jar" depends="init,setProxy,noProxy,get-custom-dep-portlet-api.jar">
+ <mkdir dir="${libdir}/javax.portlet/jars/">
+ </mkdir>
+ <get dest="${libdir}/javax.portlet/jars/portlet-api-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/javax.portlet/jars/portlet-api-1.0.jar">
+ </get>
+ <get dest="${libdir}/javax.portlet/jars/portlet-api-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://people.apache.org/repo/m1-snapshot-repository/javax.portlet/jars/portlet-api-1.0.jar">
+ </get>
+ </target>
+ <target name="get-custom-dep-portlet-api.jar" if="portlet-api.jar" depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/javax.portlet/jars/">
+ </mkdir>
+ <get dest="${libdir}/javax.portlet/jars/portlet-api-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${portlet-api.jar}">
+ </get>
+ </target>
+ <target name="get-dep-junit.jar" description="o Download the dependency : junit.jar" unless="junit.jar" depends="init,setProxy,noProxy,get-custom-dep-junit.jar">
+ <mkdir dir="${libdir}/junit/jars/">
+ </mkdir>
+ <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/junit/jars/junit-3.8.1.jar">
+ </get>
+ <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://people.apache.org/repo/m1-snapshot-repository/junit/jars/junit-3.8.1.jar">
+ </get>
+ </target>
+ <target name="get-custom-dep-junit.jar" if="junit.jar" depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/junit/jars/">
+ </mkdir>
+ <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="${junit.jar}">
+ </get>
+ </target>
+ <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}/maven/plugins/maven-xdoc-plugin-1.9.2.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven/plugins/maven-xdoc-plugin-1.9.2.jar">
+ </get>
+ <get dest="${libdir}/maven/plugins/maven-xdoc-plugin-1.9.2.jar" usetimestamp="true" ignoreerrors="true" src="http://people.apache.org/repo/m1-snapshot-repository/maven/plugins/maven-xdoc-plugin-1.9.2.jar">
+ </get>
+ </target>
+ <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}/maven/plugins/maven-xdoc-plugin-1.9.2.jar" usetimestamp="true" ignoreerrors="true" src="${maven-xdoc-plugin.jar}">
+ </get>
+ </target>
+ <target name="get-dep-maven-changelog-plugin.jar" description="o Download the dependency : maven-changelog-plugin.jar" unless="maven-changelog-plugin.jar" depends="init,setProxy,noProxy,get-custom-dep-maven-changelog-plugin.jar">
+ <mkdir dir="${libdir}/maven/plugins/">
+ </mkdir>
+ <get dest="${libdir}/maven/plugins/maven-changelog-plugin-1.9.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven/plugins/maven-changelog-plugin-1.9.1.jar">
+ </get>
+ <get dest="${libdir}/maven/plugins/maven-changelog-plugin-1.9.1.jar" usetimestamp="true" ignoreerrors="true" src="http://people.apache.org/repo/m1-snapshot-repository/maven/plugins/maven-changelog-plugin-1.9.1.jar">
+ </get>
+ </target>
+ <target name="get-custom-dep-maven-changelog-plugin.jar" if="maven-changelog-plugin.jar" depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/maven/plugins/">
+ </mkdir>
+ <get dest="${libdir}/maven/plugins/maven-changelog-plugin-1.9.1.jar" usetimestamp="true" ignoreerrors="true" src="${maven-changelog-plugin.jar}">
+ </get>
+ </target>
+ <target name="get-deps" unless="noget" depends="get-dep-commons-io.jar,get-dep-servlet-api.jar,get-dep-portlet-api.jar,get-dep-junit.jar,get-dep-maven-xdoc-plugin.jar,get-dep-maven-changelog-plugin.jar">
+ </target>
+ <target name="setProxy" if="useProxy" depends="init">
+ <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+ <echo>Proxy used :</echo>
+ <echo>Proxy host [${proxy.host}]</echo>
+ <echo>Proxy port [${proxy.port}]</echo>
+ <echo>Proxy user [${proxy.username}]</echo>
+ <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}">
+ </setproxy>
+ </target>
+ <target name="noProxy" unless="useProxy" depends="init">
+ <echo>Proxy not used.</echo>
</target>
<target name="install-maven">
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">