sanders 02/01/29 22:41:21
Modified: util .cvsignore build.xml
Added: util RELEASE-NOTES.txt build.properties.sample
Removed: util LICENSE README.txt build.properties
Log:
updated the build to a similar as digester etc.
Revision Changes Path
1.2 +2 -0 jakarta-commons-sandbox/util/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/util/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 10 Aug 2001 20:39:03 -0000 1.1
+++ .cvsignore 30 Jan 2002 06:41:21 -0000 1.2
@@ -1 +1,3 @@
+dist
target
+util.ipr
\ No newline at end of file
1.7 +282 -197 jakarta-commons-sandbox/util/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/util/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 22 Jan 2002 20:23:54 -0000 1.6
+++ build.xml 30 Jan 2002 06:41:21 -0000 1.7
@@ -1,197 +1,282 @@
-<project name="Jakarta Commons Utilities" default="jar" basedir=".">
-
-<!--
- $Id: build.xml,v 1.6 2002/01/22 20:23:54 jvanzyl Exp $
--->
-
-<!-- ========== Initialize Properties =================================== -->
-
-
- <property file="./build.properties"/> <!-- Component loc -->
- <property file="../build.properties"/> <!-- Commons local -->
- <property file="${user.home}/build.properties"/> <!-- User local -->
-
-
-<!-- ========== Classpaths ============================================== -->
-
- <path id="compile.classpath">
- <pathelement location="${build.home}/class"/>
- </path>
-
- <path id="servlet.classpath">
- <path refid="compile.classpath"/>
- <path location="jsdk.jar"/>
- </path>
-
- <path id="test.classpath">
- <pathelement location="${build.home}/class"/>
- <pathelement location="${build.home}/test"/>
- <pathelement location="${junit.jar}"/>
- </path>
-
- <path id="servlet.classpath">
- <pathelement location="${servlet.jar}" />
- </path>
-
-
-<!-- ========== Executable Targets ====================================== -->
-
- <target name="init"
- description="Initialize and evaluate conditionals">
- <echo message="-------- ${component.name} ${component.version} --------"/>
- <filter token="name" value="${component.name}"/>
- <filter token="version" value="${component.version}"/>
-
- <available
- classname="junit.framework.TestCase"
- property="junit.present"
- classpathref="test.classpath"/>
- <available
- classname="javax.servlet.http.HttpServletRequest"
- property="servlet.request.present"
- classpathref="servlet.classpath"/>
- </target>
-
-
- <target name="prepare" depends="init"
- description="Prepare build directory">
- <mkdir dir="${build.home}"/>
- <mkdir dir="${build.home}/class"/>
- <mkdir dir="${build.home}/conf"/>
- <mkdir dir="${build.home}/test"/>
- </target>
-
-
- <target name="static" depends="prepare"
- description="Copy static files to build directory">
- <tstamp/>
- </target>
-
- <target name="compile" depends="static"
- description="Compile shareable components">
-
- <javac srcdir="${source.home}/java"
- excludes="org/apache/commons/util/http/RequestUtils.java,
- org/apache/commons/util/http/ExtendedBrowserDetector.java"
- destdir="${build.home}/class"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
- <classpath refid="compile.classpath"/>
- </javac>
-
- </target>
-
- <target name="compile-request" depends="compile" if="servlet.request.present"
- description="Compiles classes dependant on the HttpServletRequest class">
-
- <javac srcdir="${source.home}/java"
- includes="org/apache/commons/util/http/RequestUtils.java,
- org/apache/commons/util/http/ExtendedBrowserDetector.java"
- destdir="${build.home}/class"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
- <classpath refid="servlet.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,compile-request"
- 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}/java"
- 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) 2001 - Apache Software Foundation"/>
- </target>
-
-
- <target name="jar" depends="compile,compile-request" description="Build jar">
- <jar jarfile="${component.jar}"
- basedir="${build.home}/class"
- manifest="${source.home}/conf/MANIFEST.MF" />
- </target>
-
-
- <target name="dist" depends="compile,compile-request,javadoc"
- description="Create binary distribution">
- <mkdir dir="${dist.home}"/>
- <copy file="LICENSE" todir="${dist.home}"/>
-
- <jar jarfile="${dist.home}/${component.jar}"
- basedir="${build.home}/class"
- manifest="${source.home}/conf/MANIFEST.MF"/>
- </target>
-
-
- <target name="install-jar" depends="jar"
- description="==> Installs .jar file in ${lib.repo}">
- <copy todir="${lib.repo}" filtering="no">
- <fileset dir="${build.dir}">
- <include name="${component.jar}"/>
- </fileset>
- </copy>
- </target>
-
-
- <target name="compile-tests" depends="prepare,compile" if="junit.present"
- description="==> compiles the test source code">
- <mkdir dir="${build.home}/test"/>
-
- <javac srcdir="${test.home}"
- destdir="${build.home}/test"
- excludes="**/package.html"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="test.classpath"/>
- <classpath>
- <pathelement path="${build.dest}"/>
- </classpath>
- </javac>
- </target>
-
-
-<!-- ========== Unit Test Targets ======================================= -->
-
- <target name="run-tests" depends="prepare,compile-tests" if="junit.present"
- description="==> Runs the unit tests">
-
- <taskdef name="junit"
- classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
- <classpath refid="test.classpath"/>
- </taskdef>
-
- <junit printsummary="no" haltonfailure="yes">
- <classpath>
- <path refid="test.classpath"/>
- </classpath>
- <formatter type="plain" usefile="false"/>
-
- <batchtest>
- <fileset dir="${test.home}">
- <include name="**/*Test.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
-</project>
+<project name="Util" default="compile" basedir=".">
+
+
+<!--
+ "Util" component of the Jakarta Commons Subproject
+ $Id: build.xml,v 1.7 2002/01/30 06:41:21 sanders Exp $
+-->
+
+
+<!-- ========== Initialize Properties ===================================== -->
+
+
+ <property file="build.properties"/> <!-- Component local -->
+ <property file="../build.properties"/> <!-- Commons local -->
+ <property file="${user.home}/build.properties"/> <!-- User local -->
+
+
+<!-- ========== External Dependencies ===================================== -->
+
+
+ <!-- The directory containing your binary distribution of JUnit,
+ version 3.7 or later -->
+ <property name="junit.home" value="/usr/local/junit3.7"/>
+
+
+<!-- ========== Derived Values ============================================ -->
+
+
+ <!-- The pathname of the "junit.jar" JAR file -->
+ <property name="junit.jar" value="${junit.home}/junit.jar"/>
+
+
+<!-- ========== Component Declarations ==================================== -->
+
+
+ <!-- The name of this component -->
+ <property name="component.name" value="util"/>
+
+ <!-- The primary package name of this component -->
+ <property name="component.package" value="org.apache.commons.util"/>
+
+ <!-- The title of this component -->
+ <property name="component.title" value="Jakarta Commons Utilities"/>
+
+ <!-- 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"/>
+
+ <!-- The base directory for unit test sources -->
+ <property name="test.home" value="src/test"/>
+
+
+<!-- ========== 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="true"/>
+
+ <!-- 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="${servlet.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}"/>
+ </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.name}"/>
+ <filter token="package" 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="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) 2001-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}"/>
+ <copy file="RELEASE-NOTES.txt"
+ todir="${dist.home}"/>
+ <antcall target="jar"/>
+ </target>
+
+
+ <target name="jar" depends="compile"
+ description="Create jar">
+ <mkdir dir="${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}-${component.version}.jar"
+ basedir="${build.home}/classes"
+ manifest="${build.home}/conf/MANIFEST.MF"/>
+ </target>
+
+
+ <target name="install-jar" depends="jar"
+ description="--> Installs jar file in ${lib.repo}">
+ <copy todir="${lib.repo}" filtering="no">
+ <fileset dir="${dist.home}">
+ <include name="commons-${component.name}-${component.version}.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+
+<!-- ========== Unit Test Targets ========================================= -->
+
+
+ <target name="test" depends="compile.tests,
+ test.hexdump,
+ test.bitfield,
+ test.sequencedhashtable,
+ test.buffercache,
+ test.stringutils
+ "
+ description="Run all unit test cases">
+ </target>
+
+
+ <target name="test.hexdump" depends="compile.tests">
+ <echo message="Running HexDump tests ..."/>
+ <java classname="${test.runner}" fork="yes"
+ failonerror="${test.failonerror}">
+ <arg value="org.apache.commons.util.HexDumpTest"/>
+ <classpath refid="test.classpath"/>
+ </java>
+ </target>
+
+ <target name="test.bitfield" depends="compile.tests">
+ <echo message="Running BitField tests ..."/>
+ <java classname="${test.runner}" fork="yes"
+ failonerror="${test.failonerror}">
+ <arg value="org.apache.commons.util.BitFieldTest"/>
+ <classpath refid="test.classpath"/>
+ </java>
+ </target>
+
+ <target name="test.sequencedhashtable" depends="compile.tests">
+ <echo message="Running SequencedHashtable tests ..."/>
+ <java classname="${test.runner}" fork="yes"
+ failonerror="${test.failonerror}">
+ <arg value="org.apache.commons.util.SequencedHashtableTest"/>
+ <classpath refid="test.classpath"/>
+ </java>
+ </target>
+
+ <target name="test.buffercache" depends="compile.tests">
+ <echo message="Running BufferCache tests ..."/>
+ <java classname="${test.runner}" fork="yes"
+ failonerror="${test.failonerror}">
+ <arg value="org.apache.commons.util.BufferCacheTest"/>
+ <classpath refid="test.classpath"/>
+ </java>
+ </target>
+
+ <target name="test.stringutils" depends="compile.tests">
+ <echo message="Running StringUtils tests ..."/>
+ <java classname="${test.runner}" fork="yes"
+ failonerror="${test.failonerror}">
+ <arg value="org.apache.commons.util.StringUtilsTest"/>
+ <classpath refid="test.classpath"/>
+ </java>
+ </target>
+
+</project>
1.1 jakarta-commons-sandbox/util/RELEASE-NOTES.txt
Index: RELEASE-NOTES.txt
===================================================================
$Id: RELEASE-NOTES.txt,v 1.1 2002/01/30 06:41:21 sanders Exp $
Commons Util Package
Version 1.0-dev
Release Notes
INTRODUCTION:
This document contains the release notes for this version of the Commons
Util package, and highlights changes since the previous version. The
current release adds new features and bug fixes, and is being done now to
follow the release early/release often mentality.
NEW FEATURES:
*
BUG FIXES:
1.1 jakarta-commons-sandbox/util/build.properties.sample
Index: build.properties.sample
===================================================================
# The directory containing your binary distribution of JUnit,
# version 3.7 or later
junit.home = /usr/local/junit3.7
# The pathname of the "junit.jar" JAR file
junit.jar = ${junit.home}/junit.jar
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
