jstrachan 2003/01/23 03:33:46
Modified: vfs build.xml
attributes build.xml
jexl build.xml
Log:
regenerated the ant build file so it includes the license & manifest entry in the jar
Revision Changes Path
1.9 +153 -159 jakarta-commons-sandbox/vfs/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 25 Nov 2002 21:36:21 -0000 1.8
+++ build.xml 23 Jan 2003 11:33:45 -0000 1.9
@@ -1,204 +1,198 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="jar" name="commons-vfs" 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="resourcedir" value="src/java"></property>
-
- <property name="distdir" value="dist"></property>
- <property name="javadocdir" value="target/docs/apidocs"></property>
- <property name="final.name" value="commons-vfs-1.0-dev"></property>
-
+ <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-vfs-1.0-dev">
+ </property>
<target name="init" description="o Initializes some properties">
- <mkdir dir="lib"></mkdir>
+ <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>
-
-
-
-
-
<copy todir="${classesdir}">
-
- <fileset dir="${resourcedir}">
-
-
- <include name="**/*.properties"></include>
-
-
+ <fileset dir="src/java">
+ <include name="**/*.properties">
+ </include>
</fileset>
</copy>
-
-
-
-
-
-
</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}">
+ <metainf dir="${basedir}">
+ <include name="LICENSE.txt">
+ </include>
+ </metainf>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}">
+ </attribute>
+ <attribute name="Created-By" value="Apache Jakarta Maven">
+ </attribute>
+ <attribute name="Package" value="org.apache.commons.vfs">
+ </attribute>
+ <attribute name="Build-Jdk" value="${java.version}">
+ </attribute>
+ <section name="org.apache.commons.vfs">
+ <attribute name="Specification-Title" value="commons-vfs">
+ </attribute>
+ <attribute name="Specification-Version" value="1.0-dev">
+ </attribute>
+ <attribute name="Specification-Vendor" value="Apache Jakarta Project">
+ </attribute>
+ <attribute name="Implementation-Title" value="org.apache.commons.vfs">
+ </attribute>
+ <attribute name="Implementation-Version" value="1.0-dev">
+ </attribute>
+ <attribute name="Implementation-Vendor" value="Apache Jakarta Project">
+ </attribute>
+ </section>
+ </manifest>
+ </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*, RELEASE*">
+ </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" depends="compile-tests">
-
- <mkdir dir="${testreportdir}"></mkdir>
- <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true"
haltonerror="true">
-
- <sysproperty key="basedir" value="${basedir}"></sysproperty>
- <formatter type="xml"></formatter>
- <formatter usefile="true" type="plain"></formatter>
- <classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
- </fileset>
- <pathelement path="${testclassesdir}"></pathelement>
- <pathelement path="${classesdir}"></pathelement>
- </classpath>
- <batchtest todir="${testreportdir}">
- <fileset dir="src/test">
-
- <include name="**/test/*TestCase.java"></include>
-
-
- <exclude name="**/test/Abstract*TestCase.java"></exclude>
-
-
-
-
-
-
- <exclude name="**/*.java"></exclude>
-
-
- </fileset>
- </batchtest>
- </junit>
-
+ <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="${libdir}">
+ <include name="*.jar">
+ </include>
+ </fileset>
+ <pathelement path="${testclassesdir}">
+ </pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ <batchtest todir="${testreportdir}">
+ <fileset dir="src/test">
+ <include name="**/test/*TestCase.java">
+ </include>
+ <exclude name="**/test/Abstract*TestCase.java">
+ </exclude>
+ <exclude name="**/*.java">
+ </exclude>
+ </fileset>
+ </batchtest>
+ </junit>
</target>
-
<target name="compile-tests" depends="compile">
-
- <mkdir dir="${testclassesdir}"></mkdir>
- <javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
- <src>
- <pathelement location="src/test"></pathelement>
- </src>
- <classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
- </fileset>
- <pathelement path="${classesdir}"></pathelement>
- </classpath>
- </javac>
-
-
-
-
-
+ <mkdir dir="${testclassesdir}">
+ </mkdir>
+ <javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="src/test">
+ </pathelement>
+ </src>
+ <classpath>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
+ </fileset>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ </javac>
</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 Jakarta Project.
All Rights Reserved."></property>
-
- <property name="title" value="commons-vfs 1.0-dev API"></property>
-
+ <property name="copyright" value="Copyright &copy; Apache Jakarta Project.
All Rights Reserved.">
+ </property>
+ <property name="title" value="commons-vfs 1.0-dev API">
+ </property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.commons.vfs.*">
<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">
-
-
- <get dest="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.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="lib/commons-net-SNAPSHOT.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-net/jars/commons-net-SNAPSHOT.jar";></get>
- <get dest="lib/commons-logging-1.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.jar";></get>
- <get dest="lib/jcifs-0.7.0b5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/jcifs/jars/jcifs-0.7.0b5.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="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar";></get>
- <get dest="lib/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar";></get>
- </target>
-
-
-
-
-
-
-
-
-
-
+ <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}/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}/commons-net-SNAPSHOT.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-net/jars/commons-net-SNAPSHOT.jar";>
+ </get>
+ <get dest="${libdir}/commons-logging-1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.jar";>
+ </get>
+ <get dest="${libdir}/jcifs-0.7.0b5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/jcifs/jars/jcifs-0.7.0b5.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="${maven.repo.remote}/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.3 +155 -174 jakarta-commons-sandbox/attributes/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/attributes/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 5 Dec 2002 19:58:34 -0000 1.2
+++ build.xml 23 Jan 2003 11:33:46 -0000 1.3
@@ -1,219 +1,200 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="jar" name="commons-attributes" 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="resourcedir" value="src/java"></property>
-
- <property name="distdir" value="dist"></property>
- <property name="javadocdir" value="target/docs/apidocs"></property>
- <property name="final.name" value="commons-attributes-0.1"></property>
-
+ <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-attributes-0.1">
+ </property>
<target name="init" description="o Initializes some properties">
- <mkdir dir="lib"></mkdir>
+ <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>
-
-
-
-
-
- <copy todir="${classesdir}">
-
- <fileset dir="${resourcedir}">
-
-
- <include name="**/*.xml"></include>
-
-
- </fileset>
- </copy>
-
-
-
-
-
-
<copy todir="${testclassesdir}">
-
-
-
-
<fileset dir="src/test">
-
-
- <include name="**/*.xml"></include>
-
- <include name="**/*.properties"></include>
-
-
+ <include name="**/*.xml">
+ </include>
+ <include name="**/*.properties">
+ </include>
</fileset>
</copy>
-
-
-
</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}">
+ <metainf dir="${basedir}">
+ <include name="LICENSE.txt">
+ </include>
+ </metainf>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}">
+ </attribute>
+ <attribute name="Created-By" value="Apache Jakarta Maven">
+ </attribute>
+ <attribute name="Package" value="org.apache.commons.attributes">
+ </attribute>
+ <attribute name="Build-Jdk" value="${java.version}">
+ </attribute>
+ <section name="org.apache.commons.attributes">
+ <attribute name="Specification-Title" value="commons-attributes">
+ </attribute>
+ <attribute name="Specification-Version" value="0.1">
+ </attribute>
+ <attribute name="Specification-Vendor" value="Apache Software Foundation">
+ </attribute>
+ <attribute name="Implementation-Title"
value="org.apache.commons.attributes">
+ </attribute>
+ <attribute name="Implementation-Version" value="0.1">
+ </attribute>
+ <attribute name="Implementation-Vendor" value="Apache Software
Foundation">
+ </attribute>
+ </section>
+ </manifest>
+ </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*, RELEASE*">
+ </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" depends="compile-tests">
-
- <mkdir dir="${testreportdir}"></mkdir>
- <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true"
haltonerror="true">
-
- <sysproperty key="basedir"
value="C:\eclipse\workspace\attributes"></sysproperty>
- <formatter type="xml"></formatter>
- <formatter usefile="true" type="plain"></formatter>
- <classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
- </fileset>
- <pathelement path="${testclassesdir}"></pathelement>
- <pathelement path="${classesdir}"></pathelement>
- </classpath>
- <batchtest todir="${testreportdir}">
- <fileset dir="src/test">
-
- <include name="**/*Test.java"></include>
-
-
- <exclude name="**/Abstract*.java"></exclude>
-
-
-
-
- </fileset>
- </batchtest>
- </junit>
-
+ <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="${libdir}">
+ <include name="*.jar">
+ </include>
+ </fileset>
+ <pathelement path="${testclassesdir}">
+ </pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ <batchtest todir="${testreportdir}">
+ <fileset dir="src/test">
+ <include name="**/*Test.java">
+ </include>
+ <exclude name="**/Abstract*.java">
+ </exclude>
+ </fileset>
+ </batchtest>
+ </junit>
</target>
-
<target name="compile-tests" depends="compile">
-
- <mkdir dir="${testclassesdir}"></mkdir>
- <javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
- <src>
- <pathelement location="src/test"></pathelement>
- </src>
- <classpath>
- <fileset dir="lib">
- <include name="*.jar"></include>
- </fileset>
- <pathelement path="${classesdir}"></pathelement>
- </classpath>
- </javac>
-
-
-
-
-
+ <mkdir dir="${testclassesdir}">
+ </mkdir>
+ <javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="src/test">
+ </pathelement>
+ </src>
+ <classpath>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
+ </fileset>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ </javac>
</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="Commons Attributes 0.1 API"></property>
-
+ <property name="copyright" value="Copyright &copy; Apache Software
Foundation. All Rights Reserved.">
+ </property>
+ <property name="title" value="Commons Attributes 0.1 API">
+ </property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.commons.attributes.*">
<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">
-
-
- <get dest="lib/qdox-1.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/qdox/jars/qdox-1.1.jar";></get>
- <get dest="lib/commons-logging-1.0.2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.2.jar";></get>
- <get dest="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.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="lib/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar";></get>
- <get dest="lib/xerces-2.0.2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.0.2.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="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar";></get>
- <get dest="lib/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar";></get>
- </target>
-
-
-
-
-
-
-
-
-
-
+ <get dest="${libdir}/qdox-1.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/qdox/jars/qdox-1.1.jar";>
+ </get>
+ <get dest="${libdir}/commons-logging-1.0.2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.2.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}/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}/xml-apis-1.0.b2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar";>
+ </get>
+ <get dest="${libdir}/xerces-2.0.2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.0.2.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>
-
- </target>
-
-</project>
-
\ No newline at end of file
+ <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>
+ </target>
+</project>
\ No newline at end of file
1.2 +183 -287 jakarta-commons-sandbox/jexl/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jexl/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 26 Apr 2002 04:23:13 -0000 1.1
+++ build.xml 23 Jan 2003 11:33:46 -0000 1.2
@@ -1,293 +1,189 @@
-<project name="Jexl" default="compile" basedir=".">
-
-
-<!--
- "Jexl" component of the Jakarta Commons Subproject
- $Id$
--->
-
-
-<!-- ========== Initialize Properties ===================================== -->
-
-
- <property file="build.properties"/> <!-- Component local -->
- <property file="../build.properties"/> <!-- Commons local -->
- <property file="${user.home}/build.properties"/> <!-- User local -->
-
-
-<!-- ========== Component Declarations ==================================== -->
-
-
- <!-- The name of this component -->
- <property name="component.name" value="jexl"/>
-
- <!-- The primary package name of this component -->
- <property name="component.package" value="org.apache.commons.jexl"/>
-
- <!-- The title of this component -->
- <property name="component.title" value="Jexl - Java EXpression Language
engine"/>
-
- <!-- The current version number of this component -->
- <property name="component.version" value="1.0-dev"/>
-
- <!-- The base directory for compilation targets -->
- <property name="build.home" value="target"/>
-
- <!-- The base directory for component configuration files -->
- <property name="conf.home" value="src/conf"/>
-
- <!-- The base directory for distribution targets -->
- <property name="dist.home" value="dist"/>
-
- <!-- The base directory for component sources -->
- <property name="source.home" value="src/java"/>
+<?xml version="1.0" encoding="UTF-8"?>
- <!-- The base directory for documentation sources -->
- <property name="docs.src" value="xdocs"/>
-
- <!-- The base directory for documentation sources -->
- <property name="docs.dest" value="docs"/>
-
- <!-- The base directory for unit test sources -->
- <property name="test.home" value="src/test"/>
-
- <!-- The base directory for example sources -->
- <property name="examples.home" value="examples"/>
-
-
-<!-- ========== Compiler Defaults ========================================= -->
-
-
- <!-- Should Java compilations set the 'debug' compiler option? -->
- <property name="compile.debug" value="true"/>
-
- <!-- Should Java compilations set the 'deprecation' compiler option? -->
- <property name="compile.deprecation" value="false"/>
-
- <!-- Should Java compilations set the 'optimize' compiler option? -->
- <property name="compile.optimize" value="true"/>
-
- <!-- Construct compile classpath -->
- <path id="compile.classpath">
- <pathelement location="${build.home}/classes"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${logging.jar}"/>
- <pathelement location="${velocity.jar}"/>
- <pathelement location="${dvsl.jar}"/>
- <pathelement location="${dom4j.jar}"/>
-
- </path>
-
-
-<!-- ========== Test Execution Defaults =================================== -->
-
-
- <!-- Construct unit test classpath -->
- <path id="test.classpath">
- <pathelement location="${build.home}/classes"/>
- <pathelement location="${build.home}/tests"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${logging.jar}"/>
- <pathelement location="${velocity.jar}"/>
- </path>
-
- <!-- Should all tests fail if one does? -->
- <property name="test.failonerror" value="true"/>
-
- <!-- The test runner to execute -->
- <property name="test.runner" value="junit.textui.TestRunner"/>
-
-
-<!-- ========== Executable Targets ======================================== -->
-
-
- <target name="init"
- description="Initialize and evaluate conditionals">
- <echo message="-------- ${component.name} ${component.version} --------"/>
- <filter token="name" value="${component.package}"/>
- <filter token="version" value="${component.version}"/>
- </target>
-
-
- <target name="prepare" depends="init"
- description="Prepare build directory">
- <mkdir dir="${build.home}"/>
- <mkdir dir="${build.home}/classes"/>
- <mkdir dir="${build.home}/conf"/>
- <mkdir dir="${build.home}/tests"/>
- </target>
-
-
- <target name="static" depends="prepare"
- description="Copy static files to build directory">
- <tstamp/>
- <copy todir="${build.home}/conf" filtering="on">
- <fileset dir="${conf.home}" includes="*.MF"/>
- </copy>
- </target>
-
-
- <target name="compile" depends="static"
- description="Compile shareable components">
- <javac srcdir="${source.home}"
- destdir="${build.home}/classes"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
- <classpath refid="compile.classpath"/>
- </javac>
- <copy todir="${build.home}/classes" filtering="on">
- <fileset dir="${source.home}" excludes="**/*.java"/>
- </copy>
- </target>
-
-
- <target name="compile.tests" depends="compile"
- description="Compile unit test cases">
- <javac srcdir="${test.home}"
- destdir="${build.home}/tests"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
- <classpath refid="test.classpath"/>
- </javac>
- <copy todir="${build.home}/tests" filtering="on">
- <fileset dir="${test.home}" excludes="**/*.java"/>
- </copy>
- </target>
-
- <target name="compile.examples" depends="compile"
- description="Compile exammple">
- <javac srcdir="${examples.home}"
- destdir="${examples.home}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
- <classpath refid="compile.classpath"/>
+<project default="jar" name="commons-jexl" 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-jexl-1.0-beta-1">
+ </property>
+ <target name="init" description="o Initializes some properties">
+ <mkdir dir="${libdir}">
+ </mkdir>
+ <condition property="noget">
+ <equals arg2="only" arg1="${build.sysclasspath}">
+ </equals>
+ </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>
+ </src>
+ <classpath>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
+ </fileset>
+ </classpath>
</javac>
</target>
-
-
- <target name="clean"
- description="Clean build and distribution directories">
- <delete dir="${build.home}"/>
- <delete dir="${dist.home}"/>
- </target>
-
-
- <target name="all" depends="clean,compile"
- description="Clean and compile all components"/>
-
-
- <target name="javadoc" depends="compile"
- description="Create component Javadoc documentation">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${dist.home}/docs"/>
- <mkdir dir="${dist.home}/docs/api"/>
- <javadoc sourcepath="${source.home}"
- destdir="${dist.home}/docs/api"
- packagenames="org.apache.commons.*"
- author="true"
- private="true"
- version="true"
- doctitle="<h1>${component.title}</h1>"
- windowtitle="${component.title} (Version ${component.version})"
- bottom="Copyright (c) 2002 - Apache Software Foundation">
- <classpath refid="compile.classpath"/>
- </javadoc>
- </target>
-
-
- <target name="dist" depends="compile,javadoc"
- description="Create binary distribution">
- <mkdir dir="${dist.home}"/>
- <copy file="../LICENSE"
- todir="${dist.home}"/>
- <mkdir dir="${build.home}/classes/META-INF"/>
- <copy file="../LICENSE"
- tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <jar jarfile="${dist.home}/commons-${component.name}.jar"
- basedir="${build.home}/classes"
- manifest="${build.home}/conf/MANIFEST.MF"/>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- D O C S -->
- <!-- ================================================================== -->
- <target name="docs" depends="docs-init"
- description="Generate documentation">
- <dvsl
- basedir="${docs.src}"
- destdir="${docs.dest}/"
- toolboxfile="${docs.src}/toolbox.props"
- extension=".html"
- style="${docs.src}/site.dvsl"
- excludes="**/project.xml"
- includes="**/*.xml"
- />
- </target>
-
- <target name="docs-init">
- <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
- <classpath>
- <pathelement location="${dvsl.jar}"/>
- <path refid="compile.classpath"/>
- </classpath>
- </taskdef>
- </target>
-
-<!-- ========== Unit Test Targets ========================================= -->
-
-
- <target name="test" depends="compile.tests,
- test.parser,
- test.jexl"
- description="Run all unit test cases">
- </target>
-
- <target name="test.parser" depends="compile.tests" >
- <echo message="Basic parser test"/>
- <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
- <arg value="org.apache.commons.jexl.parser.ParserTest"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.jexl" depends="compile.tests" >
- <echo message="Basic expression test"/>
- <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
- <arg value="org.apache.commons.jexl.JexlTest"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
-
-<!-- ============ Example Targets ========================================== -->
-
- <target name="examples" depends="compile.examples">
-
- <echo message="Basic array example"/>
- <java classname="ArrayExample" fork="yes" failonerror="${test.failonerror}">
-
- <classpath>
- <path refid="test.classpath"/>
- <pathelement location="${examples.home}"/>
+ <target name="jar" description="o Create the jar" depends="compile,test">
+ <jar jarfile="target/${final.name}.jar" excludes="**/package.html"
basedir="${classesdir}">
+ <metainf dir="${basedir}">
+ <include name="LICENSE.txt">
+ </include>
+ </metainf>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}">
+ </attribute>
+ <attribute name="Created-By" value="Apache Jakarta Maven">
+ </attribute>
+ <attribute name="Package" value="org.apache.commons.jexl">
+ </attribute>
+ <attribute name="Build-Jdk" value="${java.version}">
+ </attribute>
+ <section name="org.apache.commons.jexl">
+ <attribute name="Specification-Title" value="commons-jexl">
+ </attribute>
+ <attribute name="Specification-Version" value="1.0-beta-1">
+ </attribute>
+ <attribute name="Specification-Vendor" value="Apache Software Foundation">
+ </attribute>
+ <attribute name="Implementation-Title" value="org.apache.commons.jexl">
+ </attribute>
+ <attribute name="Implementation-Version" value="1.0-beta-1">
+ </attribute>
+ <attribute name="Implementation-Vendor" value="Apache Software
Foundation">
+ </attribute>
+ </section>
+ </manifest>
+ </jar>
+ </target>
+ <target name="clean" description="o Clean up the generated directories">
+ <delete dir="${defaulttargetdir}">
+ </delete>
+ <delete dir="${distdir}">
+ </delete>
+ </target>
+ <target name="dist" description="o Create a distribution" depends="jar, javadoc">
+ <mkdir dir="dist">
+ </mkdir>
+ <copy todir="dist">
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*, RELEASE*">
+ </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>
+ </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="${libdir}">
+ <include name="*.jar">
+ </include>
+ </fileset>
+ <pathelement path="${testclassesdir}">
+ </pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
</classpath>
-
- </java>
-
- <echo message="Method and Property Example"/>
- <java classname="MethodPropertyExample" fork="yes"
failonerror="${test.failonerror}">
-
- <classpath>
- <path refid="test.classpath"/>
- <pathelement location="${examples.home}"/>
+ <batchtest todir="${testreportdir}">
+ <fileset dir="src/test">
+
+
+<!--
+ || I've manually disabled the unit tests for now in Jexl as they don't pass!
+ ||
+ || There are a few bugs to fix!!!
+ -->
+ <include name="**/*DISABLED_Test.java">
+ </include>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+ <target name="compile-tests" depends="compile">
+ <mkdir dir="${testclassesdir}">
+ </mkdir>
+ <javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="src/test">
+ </pathelement>
+ </src>
+ <classpath>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
+ </fileset>
+ <pathelement path="${classesdir}">
+ </pathelement>
</classpath>
-
- </java>
-
-
+ </javac>
+ </target>
+ <target name="javadoc" description="o Generate javadoc" depends="jar">
+ <mkdir dir="${javadocdir}">
+ </mkdir>
+ <tstamp>
+ <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="commons-jexl 1.0-beta-1 API">
+ </property>
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.commons.jexl.*">
+ <classpath>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
+ </fileset>
+ <pathelement location="target/${final.name}.jar">
+ </pathelement>
+ </classpath>
+ </javadoc>
+ </target>
+ <target name="get-deps" unless="noget" depends="init">
+ <get dest="${libdir}/junit-3.7.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.7.jar";>
+ </get>
+ <get dest="${libdir}/commons-logging-1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.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>
</target>
-
-</project>
+</project>
\ No newline at end of file
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
