You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ma...@apache.org on 2003/06/03 08:11:48 UTC
cvs commit: jakarta-commons/fileupload build.xml project.xml
martinc 2003/06/02 23:11:48
Modified: fileupload build.xml project.xml
Log:
Update for 1.0-rc1 release, and update generated Ant build file.
Revision Changes Path
1.6 +110 -97 jakarta-commons/fileupload/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/fileupload/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 27 Oct 2002 18:47:51 -0000 1.5
+++ build.xml 3 Jun 2003 06:11:48 -0000 1.6
@@ -1,146 +1,159 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project default="jar" name="commons-fileupload" basedir=".">
-
- <property name="defaulttargetdir" value="target"></property>
- <property name="classesdir" value="target/classes"></property>
- <property name="testclassesdir" value="target/test-classes"></property>
- <property name="testreportdir" value="target/test-reports"></property>
- <property name="distdir" value="dist"></property>
- <property name="javadocdir" value="target/docs/apidocs"></property>
- <property name="final.name" value="commons-fileupload-1.0-dev"></property>
-
- <!-- The test runner to execute -->
- <property name="test.runner" value="junit.textui.TestRunner"/>
-
- <!-- Should all tests fail if one does? -->
- <property name="test.failonerror" value="true"/>
+<!--
+ build.xml generated by maven from project.xml version 1.0-rc1
+ on date June 2 2003, time 2301
+-->
-
-
+<project default="jar" name="commons-fileupload" basedir=".">
+ <property name="defaulttargetdir" value="target">
+ </property>
+ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="target/classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testreportdir" value="target/test-reports">
+ </property>
+ <property name="distdir" value="dist">
+ </property>
+ <property name="javadocdir" value="dist/docs/api">
+ </property>
+ <property name="final.name" value="commons-fileupload-1.0-rc1">
+ </property>
<target name="init" description="o Initializes some properties">
-
+ <mkdir dir="${libdir}">
+ </mkdir>
<condition property="noget">
- <equals arg2="only" arg1="${build.sysclasspath}"></equals>
+ <equals arg2="only" arg1="${build.sysclasspath}">
+ </equals>
</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="src/java"></pathelement>
+ <pathelement location="src/java">
+ </pathelement>
</src>
<classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
</fileset>
</classpath>
</javac>
-
-
-
</target>
-
<target name="jar" description="o Create the jar" depends="compile,test">
-
- <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
-
+ <jar jarfile="target/${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}"></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" depends="compile-tests">
- <mkdir dir="${testreportdir}"></mkdir>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <arg value="org.apache.commons.fileupload.TestAll"/>
+ <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
+ <fail message="There were test failures.">
+ </fail>
+ </target>
+ <target name="internal-test" depends="compile-tests">
+ <mkdir dir="${testreportdir}">
+ </mkdir>
+ <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+ <sysproperty key="basedir" value=".">
+ </sysproperty>
+ <formatter type="xml">
+ </formatter>
+ <formatter usefile="false" type="plain">
+ </formatter>
<classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
</fileset>
- <pathelement location="target/${final.name}.jar"></pathelement>
- <pathelement path="${testclassesdir}"></pathelement>
- <pathelement path="${classesdir}"></pathelement>
+ <pathelement path="${testclassesdir}">
+ </pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
</classpath>
- </java>
+ <batchtest todir="${testreportdir}">
+ <fileset dir="src/test">
+ <include name="**/Test*.java">
+ </include>
+ </fileset>
+ </batchtest>
+ </junit>
</target>
-
<target name="compile-tests" depends="compile">
- <mkdir dir="${testclassesdir}"></mkdir>
+ <mkdir dir="${testclassesdir}">
+ </mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src>
- <pathelement location="src/test"></pathelement>
+ <pathelement location="src/test">
+ </pathelement>
</src>
<classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
</fileset>
- <pathelement location="target/${final.name}.jar"></pathelement>
- <pathelement path="${classesdir}"></pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
</classpath>
</javac>
-
- <copy todir="${testclassesdir}">
- <fileset dir="src/test">
- </fileset>
- </copy>
-
</target>
-
<target name="javadoc" description="o Generate javadoc" depends="jar">
-
- <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; Apache Software Foundation. All Rights Reserved."></property>
-
- <property name="title" value="FileUpload 1.0-dev API"></property>
-
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.fileupload.*">
+ <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved.">
+ </property>
+ <property name="title" value="FileUpload 1.0-rc1 API">
+ </property>
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.*.*">
<classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
</fileset>
- <pathelement location="target/${final.name}.jar"></pathelement>
+ <pathelement location="target/${final.name}.jar">
+ </pathelement>
</classpath>
</javadoc>
-
</target>
-
<target name="get-deps" unless="noget" depends="init">
-
- <mkdir dir="lib"></mkdir>
-
- <get dest="lib/commons-beanutils-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.3.jar"></get>
- <get dest="lib/servletapi-2.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.3.jar"></get>
- <get dest="lib/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}/servletapi-2.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-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">
+ </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>
+ <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>
</target>
-
-
<target name="install-maven">
-
- <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/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
1.20 +6 -1 jakarta-commons/fileupload/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/fileupload/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 16 May 2003 04:06:02 -0000 1.19
+++ project.xml 3 Jun 2003 06:11:48 -0000 1.20
@@ -4,7 +4,7 @@
<extend>../project.xml</extend>
<name>FileUpload</name>
<id>commons-fileupload</id>
- <currentVersion>1.0-beta-2-dev</currentVersion>
+ <currentVersion>1.0-rc1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>File upload component for Java servlets</shortDescription>
<description>
@@ -16,6 +16,11 @@
<issueTrackingUrl>http://nagoya.apache.org/bugzilla/</issueTrackingUrl>
<versions>
+ <version>
+ <id>rc1</id>
+ <name>1.0-rc1</name>
+ <tag>FILEUPLOAD_1_0_RC1</tag>
+ </version>
<version>
<id>b1</id>
<name>1.0-beta-1</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org