You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by jo...@apache.org on 2007/02/07 11:29:28 UTC
svn commit: r504491 - in /jakarta/commons/proper/fileupload/branches/b1_2:
build.xml pom.xml project.xml
Author: jochen
Date: Wed Feb 7 02:29:27 2007
New Revision: 504491
URL: http://svn.apache.org/viewvc?view=rev&rev=504491
Log:
Release of 1.2rc3
Modified:
jakarta/commons/proper/fileupload/branches/b1_2/build.xml
jakarta/commons/proper/fileupload/branches/b1_2/pom.xml
jakarta/commons/proper/fileupload/branches/b1_2/project.xml
Modified: jakarta/commons/proper/fileupload/branches/b1_2/build.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/branches/b1_2/build.xml?view=diff&rev=504491&r1=504490&r2=504491
==============================================================================
--- jakarta/commons/proper/fileupload/branches/b1_2/build.xml (original)
+++ jakarta/commons/proper/fileupload/branches/b1_2/build.xml Wed Feb 7 02:29:27 2007
@@ -1,141 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--build.xml generated by maven from project.xml version 1.2-SNAPSHOT
- on date December 24 2005, time 1055-->
-
+<!--build.xml generated by maven from project.xml version 1.2rc3
+ on date February 7 2007, time 1125-->
<project default="jar" name="commons-fileupload" basedir=".">
<!--Load local and user build preferences-->
-
- <property file="build.properties">
- </property>
- <property file="${user.home}/build.properties">
- </property>
+ <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="testclassesdir" value="${basedir}/target/test-classes">
- </property>
- <property name="testreportdir" value="${basedir}/target/test-reports">
- </property>
- <property name="distdir" value="${basedir}/dist">
- </property>
- <property name="javadocdir" value="${basedir}/dist/docs/api">
- </property>
- <property name="final.name" value="commons-fileupload-1.2-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>
+ <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="testclassesdir" value="${basedir}/target/test-classes"></property>
+ <property name="testreportdir" value="${basedir}/target/test-reports"></property>
+ <property name="distdir" value="${basedir}/dist"></property>
+ <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
+ <property name="final.name" value="commons-fileupload-1.2rc3"></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">
- <pathelement location="${libdir}/commons-io/jars/commons-io-1.3.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>
+ <pathelement location="${libdir}/commons-io/jars/commons-io-1.3.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>
+ <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}">
- </mkdir>
+ <mkdir dir="${libdir}"></mkdir>
<condition property="noget">
- <equals arg2="only" arg1="${build.sysclasspath}">
- </equals>
+ <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>
+ <available property="Junit.present" classname="junit.framework.Test"></available>
<!--Test if user defined a proxy-->
-
<condition property="useProxy">
<and>
- <isset property="proxy.host">
- </isset>
+ <isset property="proxy.host"></isset>
<not>
- <equals trim="true" arg2="" arg1="${proxy.host}">
- </equals>
+ <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>
+ <mkdir dir="${classesdir}"></mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src>
- <pathelement location="${basedir}/src/java">
- </pathelement>
+ <pathelement location="${basedir}/src/java"></pathelement>
</src>
- <classpath refid="build.classpath">
- </classpath>
+ <classpath refid="build.classpath"></classpath>
</javac>
- <mkdir dir="${classesdir}/META-INF">
- </mkdir>
+ <mkdir dir="${classesdir}/META-INF"></mkdir>
<copy todir="${classesdir}/META-INF">
<fileset dir="${basedir}/.">
- <include name="NOTICE.txt">
- </include>
+ <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}">
- </jar>
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
</target>
<target name="clean" description="o Clean up the generated directories">
- <delete dir="${defaulttargetdir}">
- </delete>
- <delete dir="${distdir}">
- </delete>
+ <delete dir="${defaulttargetdir}"></delete>
+ <delete dir="${distdir}"></delete>
</target>
<target name="dist" description="o Create a distribution" depends="jar, javadoc">
- <mkdir dir="dist">
- </mkdir>
+ <mkdir dir="dist"></mkdir>
<copy todir="dist">
- <fileset dir="${defaulttargetdir}" includes="*.jar">
- </fileset>
- <fileset dir="${basedir}" includes="LICENSE*, README*">
- </fileset>
+ <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
</copy>
</target>
<target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
- <fail message="There were test failures.">
- </fail>
+ <fail message="There were test failures."></fail>
</target>
<target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
- <mkdir dir="${testreportdir}">
- </mkdir>
+ <mkdir dir="${testreportdir}"></mkdir>
<junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
- <sysproperty key="basedir" value=".">
- </sysproperty>
- <formatter type="xml">
- </formatter>
- <formatter usefile="false" type="plain">
- </formatter>
+ <sysproperty key="basedir" value="."></sysproperty>
+ <formatter type="xml"></formatter>
+ <formatter usefile="false" type="plain"></formatter>
<classpath>
- <path refid="build.classpath">
- </path>
- <pathelement path="${testclassesdir}">
- </pathelement>
- <pathelement path="${classesdir}">
- </pathelement>
+ <path refid="build.classpath"></path>
+ <pathelement path="${testclassesdir}"></pathelement>
+ <pathelement path="${classesdir}"></pathelement>
</classpath>
<batchtest todir="${testreportdir}">
<fileset dir="${basedir}/src/test">
- <include name="**/*Test.java">
- </include>
+ <include name="**/*Test.java"></include>
</fileset>
</batchtest>
</junit>
@@ -146,112 +100,103 @@
<echo>==========================================================================</echo>
</target>
<target name="compile-tests" if="Junit.present" depends="junit-present,compile">
- <mkdir dir="${testclassesdir}">
- </mkdir>
+ <mkdir dir="${testclassesdir}"></mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src>
- <pathelement location="${basedir}/src/test">
- </pathelement>
+ <pathelement location="${basedir}/src/test"></pathelement>
</src>
<classpath>
- <path refid="build.classpath">
- </path>
- <pathelement path="${classesdir}">
- </pathelement>
+ <path refid="build.classpath"></path>
+ <pathelement path="${classesdir}"></pathelement>
</classpath>
</javac>
<copy todir="${testclassesdir}">
<fileset dir="${basedir}/src/test">
- <include name="**/*.xml">
- </include>
+ <include name="**/*.xml"></include>
</fileset>
</copy>
</target>
<target name="javadoc" description="o Generate javadoc" depends="get-deps">
- <mkdir dir="${javadocdir}">
- </mkdir>
+ <mkdir dir="${javadocdir}"></mkdir>
<tstamp>
- <format pattern="2002-yyyy" property="year">
- </format>
+ <format pattern="2002-yyyy" property="year"></format>
</tstamp>
- <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved.">
- </property>
- <property name="title" value="FileUpload 1.2-SNAPSHOT API">
- </property>
+ <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved."></property>
+ <property name="title" value="FileUpload 1.2rc3 API"></property>
<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>
+ <path refid="build.classpath"></path>
</classpath>
</javadoc>
</target>
<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.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-io/jars/commons-io-1.3.jar">
- </get>
+ <mkdir dir="${libdir}/commons-io/jars/"></mkdir>
+ <get dest="${libdir}/commons-io/jars/commons-io-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/commons-io/jars/commons-io-1.3.jar"></get>
+ <get dest="${libdir}/commons-io/jars/commons-io-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://people.apache.org/repo/m1-snapshot-repository/commons-io/jars/commons-io-1.3.jar"></get>
</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.3.jar" usetimestamp="true" ignoreerrors="true" src="${commons-io.jar}">
- </get>
+ <mkdir dir="${libdir}/commons-io/jars/"></mkdir>
+ <get dest="${libdir}/commons-io/jars/commons-io-1.3.jar" usetimestamp="true" ignoreerrors="true" src="${commons-io.jar}"></get>
</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>
+ <mkdir dir="${libdir}/javax.servlet/jars/"></mkdir>
+ <get dest="${libdir}/javax.servlet/jars/servlet-api-2.3.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/javax.servlet/jars/servlet-api-2.3.jar"></get>
+ <get dest="${libdir}/javax.servlet/jars/servlet-api-2.3.jar" usetimestamp="true" ignoreerrors="true" src="http://people.apache.org/repo/m1-snapshot-repository/javax.servlet/jars/servlet-api-2.3.jar"></get>
</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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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 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>
+ <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">
- </get>
- <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
- </unjar>
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
+ <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/fileupload/branches/b1_2/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/branches/b1_2/pom.xml?view=diff&rev=504491&r1=504490&r2=504491
==============================================================================
--- jakarta/commons/proper/fileupload/branches/b1_2/pom.xml (original)
+++ jakarta/commons/proper/fileupload/branches/b1_2/pom.xml Wed Feb 7 02:29:27 2007
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2rc2</version>
+ <version>1.2rc3</version>
<name>FileUpload</name>
<description>
The FileUpload component provides a simple yet flexible means of adding support for multipart
Modified: jakarta/commons/proper/fileupload/branches/b1_2/project.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/branches/b1_2/project.xml?view=diff&rev=504491&r1=504490&r2=504491
==============================================================================
--- jakarta/commons/proper/fileupload/branches/b1_2/project.xml (original)
+++ jakarta/commons/proper/fileupload/branches/b1_2/project.xml Wed Feb 7 02:29:27 2007
@@ -22,7 +22,7 @@
<name>FileUpload</name>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <currentVersion>1.2-SNAPSHOT</currentVersion>
+ <currentVersion>1.2rc3</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>File upload component for Java servlets</shortDescription>
<description>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org