commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mart...@apache.org
Subject svn commit: r355019 - /jakarta/commons/proper/fileupload/trunk/build.xml
Date Thu, 08 Dec 2005 07:02:08 GMT
Author: martinc
Date: Wed Dec  7 23:02:01 2005
New Revision: 355019

URL: http://svn.apache.org/viewcvs?rev=355019&view=rev
Log:
Regenerate Ant build file.

Modified:
    jakarta/commons/proper/fileupload/trunk/build.xml

Modified: jakarta/commons/proper/fileupload/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/fileupload/trunk/build.xml?rev=355019&r1=355018&r2=355019&view=diff
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/build.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/build.xml Wed Dec  7 23:02:01 2005
@@ -1,32 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--build.xml generated by maven from project.xml version 1.1-dev
-  on date October 30 2004, time 2208-->
+<!--build.xml generated by maven from project.xml version 1.1-SNAPSHOT
+  on date December 7 2005, time 2257-->
 
 <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>
+  <!--Build properties-->
+
+  <property name="defaulttargetdir" value="${basedir}/target">
+  </property>
+  <property name="libdir" value="${user.home}/.maven/repository">
+  </property>
+  <property name="classesdir" value="${basedir}/target/classes">
   </property>
-  <property name="libdir" value="target/lib">
+  <property name="testclassesdir" value="${basedir}/target/test-classes">
   </property>
-  <property name="classesdir" value="target/classes">
+  <property name="testreportdir" value="${basedir}/target/test-reports">
   </property>
-  <property name="testclassesdir" value="target/test-classes">
+  <property name="distdir" value="${basedir}/dist">
   </property>
-  <property name="testclassesdir" value="target/test-classes">
+  <property name="javadocdir" value="${basedir}/dist/docs/api">
   </property>
-  <property name="testreportdir" value="target/test-reports">
+  <property name="final.name" value="commons-fileupload-1.1-SNAPSHOT">
   </property>
-  <property name="distdir" value="dist">
+  <property name="proxy.host" value="">
   </property>
-  <property name="javadocdir" value="dist/docs/api">
+  <property name="proxy.port" value="">
   </property>
-  <property name="final.name" value="commons-fileupload-1.1-dev">
+  <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.1.jar">
+    </pathelement>
+    <pathelement location="${libdir}/javax.servlet/jars/servlet-api-2.3.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>
   </path>
   <target name="init" description="o Initializes some properties">
     <mkdir dir="${libdir}">
@@ -39,18 +57,38 @@
 
     <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">
       </classpath>
     </javac>
+    <mkdir dir="${classesdir}/META-INF">
+    </mkdir>
+    <copy todir="${classesdir}/META-INF">
+      <fileset dir="${basedir}/.">
+        <include name="NOTICE.txt">
+        </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}">
@@ -79,7 +117,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">
@@ -95,7 +133,7 @@
         </pathelement>
       </classpath>
       <batchtest todir="${testreportdir}">
-        <fileset dir="src/test">
+        <fileset dir="${basedir}/src/test">
           <include name="**/*Test.java">
           </include>
         </fileset>
@@ -112,7 +150,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>
@@ -123,7 +161,7 @@
       </classpath>
     </javac>
     <copy todir="${testclassesdir}">
-      <fileset dir="src/test">
+      <fileset dir="${basedir}/src/test">
         <include name="**/*.xml">
         </include>
       </fileset>
@@ -138,28 +176,77 @@
     </tstamp>
     <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation.
All Rights Reserved.">
     </property>
-    <property name="title" value="FileUpload 1.1-dev API">
+    <property name="title" value="FileUpload 1.1-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>
-    </setproxy>
-    <get dest="${libdir}/commons-io-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-io/jars/commons-io-1.0.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.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-io/jars/commons-io-1.1.jar">
     </get>
-    <get dest="${libdir}/servletapi-2.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.3.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.1.jar" usetimestamp="true" ignoreerrors="true"
src="${commons-io.jar}">
     </get>
-    <get dest="${libdir}/portlet-api-1.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/portlet-api/jars/portlet-api-1.0.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.3.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/javax.servlet/jars/servlet-api-2.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">
+  </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.3.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://www.ibiblio.org/maven/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://www.ibiblio.org/maven/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-deps" unless="noget" depends="get-dep-commons-io.jar,get-dep-servlet-api.jar,get-dep-portlet-api.jar,get-dep-junit.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">



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message