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 2002/04/30 04:34:45 UTC

cvs commit: jakarta-commons-sandbox/util project.xml build.xml build.properties.sample

jon         02/04/29 19:34:45

  Modified:    util     build.xml
  Added:       util     project.xml
  Removed:     util     build.properties.sample
  Log:
  maven'ized commons-util
  
  maven kicks ass...
  
  -jon
  
  Revision  Changes    Path
  1.13      +93 -239   jakarta-commons-sandbox/util/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/util/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml	25 Feb 2002 18:44:27 -0000	1.12
  +++ build.xml	30 Apr 2002 02:34:45 -0000	1.13
  @@ -1,248 +1,102 @@
  -<project name="Util" default="compile" basedir=".">
  +<?xml version="1.0"?>
   
  +<project name="Commons-Util" default="maven:jar" basedir=".">
   
  -<!--
  -        "Util" component of the Jakarta Commons Subproject
  -        $Id: build.xml,v 1.12 2002/02/25 18:44:27 bayard Exp $
  --->
  +  <!-- Give user a chance to override without editing this file
  +       (and without typing -D each time they invoke a target) -->
   
  -
  -<!-- ========== 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"/>
  -  <property name="lang.home"               value="../lang"/>
  -
  -
  -<!-- ========== Derived Values ============================================ -->
  -
  -
  -  <!-- The pathname of the "junit.jar" JAR file -->
  -  <property name="junit.jar"               value="${junit.home}/junit.jar"/>
  -  <property name="commons-lang.api" value="${lang.home}/dist/docs/api"/>
  -  <property name="commons-lang.jar" value="${lang.home}/dist/commons-lang.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-rc2-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="${commons-lang.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="${commons-lang.jar}"/>  
  -    <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"/>
  +  <!-- Allow any user specific values to override the defaults -->
  +  <property file="${user.home}/build.properties" />
  +  <!-- Allow user defaults for this project -->
  +  <property file="build.properties" />
  +  <!-- Set default values for the build -->
  +  <property file="project.properties" />
  +
  +  <!-- maven:start -->
  +  
  +  <!-- ================================================================== -->
  +  <!-- D E L E G A T O R S                                                -->
  +  <!-- ================================================================== -->
  +        
  +  <target 
  +    name="maven:site">
  +    <ant antfile="${maven.home}/build-docs.xml" target="site"/>
  +  </target>
  +        
  +  <target 
  +    name="maven:jar">
  +    <ant antfile="${maven.home}/build-maven.xml" target="jar"/>
  +  </target>
  +        
  +  <target 
  +    name="maven:install-jar">
  +    <ant antfile="${maven.home}/build-maven.xml" target="install-jar"/>
  +  </target>
  +        
  +  <target 
  +    name="maven:env">
  +    <ant antfile="${maven.home}/build-maven.xml" target="env"/>
  +  </target>
  +        
  +  <target 
  +    name="maven:docs">
  +    <ant antfile="${maven.home}/build-docs.xml" target="docs"/>
  +  </target>
  +        
  +  <target 
  +    name="maven:test">
  +    <ant antfile="${maven.home}/build-test.xml" target="test"/>
  +  </target>
  +
  +  <target 
  +    name="maven:run-singletest">
  +    <ant antfile="${maven.home}/build-test.xml" target="run-singletest"/>
  +  </target>
  +
  +  <target 
  +    name="maven:clean">
  +    <ant antfile="${maven.home}/build-maven.xml" target="clean"/>
  +  </target>
  +        
  +  <target  
  +    name="maven:metrics">
  +    <ant antfile="${maven.home}/build-metrics.xml" target="metrics"/>
  +  </target>
  +        
  +  <target 
  +    name="maven:dist">
  +    <ant antfile="${maven.home}/build-maven.xml" target="dist"/>
  +  </target>
  +        
  +  <target 
  +    name="maven:deploy-site">
  +    <ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/>
  +  </target>
  +        
  +  <target 
  +    name="maven:gump-descriptor">
  +    <ant antfile="${maven.home}/build-maven.xml" target="gump-descriptor"/>
  +  </target>
  +        
  +  <target 
  +    name="maven:javadocs">
  +    <ant antfile="${maven.home}/build-docs.xml" target="javadocs"/>
  +  </target>
  +        
  +  <target 
  +    name="maven:compile">
  +    <ant antfile="${maven.home}/build-maven.xml" target="compile"/>
  +  </target>
  +
  +  <target 
  +    name="maven:update-jars">
  +    <ant antfile="${maven.home}/build-maven.xml" target="update-jars"/>
     </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 name="maven:validate-pom">
  +    <ant antfile="${maven.home}/build-maven.xml" target="validate-pom"/>
     </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="&lt;h1&gt;${component.title}&lt;/h1&gt;"
  -            windowtitle="${component.title} (Version ${component.version})"
  -                 bottom="Copyright (c) 2001-2002 - Apache Software Foundation">
  -          <link     offline="true" packagelistLoc="${commons-collections.api}"
  -                    href="http://jakarta.apache.org/commons/collections/api/"/>
  -      <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.bitfield
  -                               "
  -   description="Run all unit test cases">
  -  </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>
  +  <!-- maven:end -->
   
   </project>
  
  
  
  1.1                  jakarta-commons-sandbox/util/project.xml
  
  Index: project.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  
  <project>
    <version>2</version>
    <name>commons-util</name>
    <id>commons-util</id>
    <currentVersion>1.0-rc2-dev</currentVersion>
    <organization>Apache Software Foundation</organization>
    <inceptionYear>2002</inceptionYear>
    <package>org.apache.commons.util</package>
    <shortDescription>Commons Util</shortDescription>
    <gumpRepositoryId>jakarta</gumpRepositoryId>
    <description>Commons Util</description>
    <url>http://jakarta.apache.org/commons/</url>
    <cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/util/</cvsWebUrl>
    <issueTrackingUrl>http://nagoya.apache.org/</issueTrackingUrl>
    <siteAddress>jakarta.apache.org</siteAddress>
    <siteDirectory>/www/jakarta.apache.org/commons/util/</siteDirectory>
    
    <developers>
      <developer>
        <name>Daniel Rall</name>
        <id>dlr</id>
        <email>dlr@finemaltcoding.com</email>
        <organization>CollabNet, Inc.</organization>
      </developer>
      <developer>
        <name>Jason van Zyl</name>
        <id>jvanzyl</id>
        <email>jason@zenplex.com</email>
        <organization>Zenplex</organization>
      </developer>
      <developer>
        <name>Jon Scott Stevens</name>
        <id>jon</id>
        <email>jon@latchkey.com</email>
        <organization>CollabNet, Inc.</organization>
      </developer>
    </developers>
    
    <dependencies>
      
      <dependency>
        <name>commons-lang</name>
        <type>required</type>
        <version>0.1</version>
        <jar>commons-lang-0.1-dev.jar</jar>
      </dependency>
      
    </dependencies>
    
    <build>
      <sourceDirectories>
        <sourceDirectory>src/java</sourceDirectory>
      </sourceDirectories>
      <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
      <aspectSourceDirectories></aspectSourceDirectories>
      <unitTestPatterns>
        <unitTestPattern>include = **/*Test*.java</unitTestPattern>
      </unitTestPatterns>
      <jarResources></jarResources>
      <jars></jars>
    </build>
  </project>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>