mcconnell    2003/02/08 18:54:42

  Modified:    .        build.xml
  Added:       .        default.properties
  Log:
  CLeaning up the buildfile formatting, seperating property declarations into an 
external property file, and updating the phoniex-prepare task to include replacement 
of excalibur-thread-1.0 with excalibur-thread-1.1, replacement of excalibur-pool 1.0 
with 1.2, and the introduction of the commons-collection-2.1 jar (required by the pool 
CR).
  
  Revision  Changes    Path
  1.123     +337 -368  jakarta-james/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-james/build.xml,v
  retrieving revision 1.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- build.xml 8 Feb 2003 07:23:04 -0000       1.122
  +++ build.xml 9 Feb 2003 02:54:42 -0000       1.123
  @@ -11,111 +11,40 @@
    Harmeet Bedi      <[EMAIL PROTECTED]>
    Danny Angus       <[EMAIL PROTECTED]>
    Peter M. Goldstein <[EMAIL PROTECTED]>
  + Stephen McConnell  <[EMAIL PROTECTED]>
   
   Legal:
  -  Copyright (c) 1999-2002 The Apache Software Foundation. All Rights Reserved.
  +  Copyright (c) 1999-2003 The Apache Software Foundation. All Rights Reserved.
   
   
   ==============================================================================
    -->
  +
   <project default="main" basedir=".">
       <!--
       Give user a chance to override without editing this file
       (and without typing -D each time he compiles it)
  -  -->
  +    -->
       <property file=".ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -    <property name="name" value="james"/>
  -    <property name="Name" value="James"/>
  -    <property name="version" value="3.0a1"/>
  -    <property name="year" value="1999-2003"/>
  -    <!-- There should be no need to override default compiler but need to change
  -    javac task to run without this -->
  -    <property name="build.compiler" value="modern"/>
  -    <!--
  -    these are here only for those who use jikes compiler. For other
  -    developers this part makes no difference.
  -  -->
  -    <property name="build.compiler.emacs" value="on"/>
  -    <property name="build.compiler.pedantic" value="true"/>
  -    <property name="build.compiler.depend" value="true"/>
  -    <property name="build.compiler.fulldepend" value="true"/>
  -    <property name="debug" value="on"/>
  -    <property name="optimize" value="on"/>
  -    <property name="deprecation" value="off"/>
  -
  -    <!--
  -       ===================================================================
  -       Set the properties for proposal directories
  -       ===================================================================
  -  -->
  +    <property file="default.properties"/>
  +
  +    <!--
  +    ===================================================================
  +    Set the properties for proposal directories
  +    ===================================================================
  +    -->
   
       <property name="proposal.base" value="proposals"/>
       <property name="proposal.dir" value="${proposal.base}/${proposal.name}"/>
       <property name="java.proposal.dir" value="${proposal.dir}/java"/>
       <property name="conf.proposal.dir" value="${proposal.dir}/conf"/>
   
  -
       <!--
  -       ===================================================================
  -       Set the properties for intermediate directory
  -       ===================================================================
  -  -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.src" value="${build.dir}/src"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.javadocs" value="${build.dir}/javadocs"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.mailetdocs" value="${build.dir}/mailetdocs"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -
  -    <!--
  -       ===================================================================
  -       Set the properties for source directories and parameters
  -       ===================================================================
  -  -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>
  -    <property name="docs.src" value="${xdocs.dir}"/>
  -
  -    <property name="constants.file" value="org/apache/james/Constants.java"/>
  -    <property name="poolconn.file" 
value="org/apache/james/util/mordred/PoolConnEntry.java"/>
  -
  -
  -    <!--
  -       ===================================================================
  -       Set the properties for the distribution directories
  -       ===================================================================
  -  -->
  -    <property name="dist.base" value="dist"/>
  -    <property name="dist.name" value="${name}-${version}"/>
  -    <property name="dist.dir" value="${dist.base}/${dist.name}"/>
  -
  -    <!--
  -       ===================================================================
  -       Third party binary directories
  -       ===================================================================
  -  -->
  -    <property name="lib.dir" value="lib"/>
  -    <property name="phoenix.dir" value="phoenix-bin"/>
  -    <property name="phoenix.lib.dir" value="${phoenix.dir}/lib"/>
  -
  -    <!--
  -       ===================================================================
  -       Set the properties for the website directories
  -       ===================================================================
  -  -->
  -    <property name="www.dir" value="www"/>
  -
  -    <!--
  -       ===================================================================
  -       Set the classpath
  -       ===================================================================
  -  -->
  -    <property name="xerces.jar" value="${lib.dir}/xerces-1.4.3.jar"/>
  +    ===================================================================
  +    Set the classpath
  +    ===================================================================
  +    -->
       <path id="project.class.path">
           <pathelement location="${xerces.jar}"/>
           <pathelement path="${java.class.path}"/>
  @@ -124,12 +53,13 @@
               <exclude name="xerces.jar"/>
               <exclude name="cornerstone.jar"/>
           </fileset>
  -        <fileset dir="${lib.dir}/candidates">
  +        <fileset dir="${candidates.dir}">
               <include name="*.jar"/>
           </fileset>
           <fileset dir="${phoenix.lib.dir}">
               <include name="*.jar"/>
               <exclude name="excalibur-thead*.jar"/>
  +            <exclude name="excalibur-pool*.jar"/>
           </fileset>
           <pathelement path="${build.classes}"/>
       </path>
  @@ -138,86 +68,103 @@
       </taskdef>
   
       <!--
  -       ===================================================================
  +    ===================================================================
                                     Main target
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="main" depends="dist-lite"/>
  +
       <!--
  -       ===================================================================
  -        Prepare-common target - common tasks executed in preparation for
  -        all targets
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    Prepare-common target - common tasks executed in preparation for
  +    all targets
  +    ===================================================================
  +    -->
       <target name="prepare-common">
  -    <echo message="Preparing code"/>
   
  -        <tstamp/>
  -        <available property="jdbc3.present" classname="java.sql.Savepoint"/>
  -        <available file="${phoenix.dir}/bin" type="dir" 
property="phoenix.bin.present"/>
  -        <mkdir dir="${dist.dir}"/>
  -        <copy todir="${dist.dir}">
  -            <fileset dir=".">
  -                <include name="LICENSE.txt"/>
  -                <include name="README"/>
  -            </fileset>
  -        </copy>
  -        <fixcrlf srcdir="${java.dir}" includes="**/*.java" eol="lf" tab="remove" 
tablength="4" />
  -        <fixcrlf srcdir="${java.dir}" includes="**/*.minfo" eol="lf" tab="remove" 
tablength="4" />
  -        <fixcrlf srcdir="${java.dir}" includes="**/*.xinfo" eol="lf" tab="remove" 
tablength="4" />
  -        <fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" 
tablength="4" />
  -        <fixcrlf srcdir="${xdocs.dir}" includes="**/*.xml" eol="lf" tab="remove" 
tablength="4" />
  -        <fixcrlf srcdir="${conf.dir}" includes="**/*.xml" eol="lf" tab="remove" 
tablength="4" />
  -        <fixcrlf srcdir="." includes="build.sh" eol="lf"/>
  -        <fixcrlf srcdir="." includes="build.bat" eol="crlf"/>
  -        <fixcrlf srcdir="." includes="build.xml" eol="lf"/>
  -        <chmod perm="+x">
  -            <fileset dir=".">
  -                <include name="build.sh"/>
  -            </fileset>
  -        </chmod>
  -        <available classname="org.apache.velocity.anakia.AnakiaTask" 
property="AnakiaTask.present"/>
  -        <mkdir dir="${build.src}"/>
  -        <copy todir="${build.src}">
  -            <fileset dir="${java.dir}">
  -                <include name="${constants.file}"/>
  -                <include name="${poolconn.file}"/>
  -            </fileset>
  -        </copy>
  -        <replace file="${build.src}/${constants.file}" token="@@VERSION@@" 
value="${version}"/>
  -        <replace file="${build.src}/${constants.file}" token="@@NAME@@" 
value="${Name}"/>
  -        <replace file="${build.src}/${constants.file}" token="@@DATE@@" 
value="${TODAY}"/>
  +      <echo message="Preparing code"/>
  +
  +      <tstamp/>
  +      <available property="jdbc3.present" classname="java.sql.Savepoint"/>
  +      <available file="${phoenix.dir}/bin" type="dir" 
property="phoenix.bin.present"/>
  +      <mkdir dir="${dist.dir}"/>
  +      <copy todir="${dist.dir}">
  +        <fileset dir=".">
  +          <include name="LICENSE.txt"/>
  +          <include name="README"/>
  +        </fileset>
  +      </copy>
  +      <fixcrlf srcdir="${java.dir}" includes="**/*.java" eol="lf" tab="remove" 
tablength="4" />
  +      <fixcrlf srcdir="${java.dir}" includes="**/*.minfo" eol="lf" tab="remove" 
tablength="4" />
  +      <fixcrlf srcdir="${java.dir}" includes="**/*.xinfo" eol="lf" tab="remove" 
tablength="4" />
  +      <fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" 
tablength="4" />
  +      <fixcrlf srcdir="${xdocs.dir}" includes="**/*.xml" eol="lf" tab="remove" 
tablength="4" />
  +      <fixcrlf srcdir="${conf.dir}" includes="**/*.xml" eol="lf" tab="remove" 
tablength="4" />
  +      <fixcrlf srcdir="." includes="build.sh" eol="lf"/>
  +      <fixcrlf srcdir="." includes="build.bat" eol="crlf"/>
  +      <fixcrlf srcdir="." includes="build.xml" eol="lf"/>
  +      <chmod perm="+x">
  +        <fileset dir=".">
  +          <include name="build.sh"/>
  +        </fileset>
  +      </chmod>
  +      <available classname="org.apache.velocity.anakia.AnakiaTask" 
property="AnakiaTask.present"/>
  +      <mkdir dir="${build.src}"/>
  +      <copy todir="${build.src}">
  +        <fileset dir="${java.dir}">
  +          <include name="${constants.file}"/>
  +          <include name="${poolconn.file}"/>
  +        </fileset>
  +      </copy>
  +      <replace file="${build.src}/${constants.file}" token="@@VERSION@@" 
value="${version}"/>
  +      <replace file="${build.src}/${constants.file}" token="@@NAME@@" 
value="${Name}"/>
  +      <replace file="${build.src}/${constants.file}" token="@@DATE@@" 
value="${TODAY}"/>
  +
       </target>
   
       <!--
  -       ===================================================================
  -         Copy files, set permissions and line feeds for the packaged Phoenix 
distribution
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    Copy files, set permissions and line feeds for the packaged Phoenix distribution
  +    ===================================================================
  +    -->
       <target name="prepare-phoenix" depends="prepare-common" 
if="phoenix.bin.present">
  -        <echo message="Phoenix distribution present - adjusting linefeeds and 
permissions, copying files"/>
  -        <property name="dist.bin" value="${dist.dir}/bin"/>
  -        <fixcrlf srcdir="${phoenix.dir}/bin" includes="phoenix.sh" eol="lf"/>
  -        <copy todir="${dist.dir}">
  -            <fileset dir="${phoenix.dir}">
  -                <exclude name="CVS/**"/>
  -            </fileset>
  -        </copy>
  -        <fixcrlf srcdir="${dist.bin}" includes="run.sh" eol="lf"/>
  -        <fixcrlf srcdir="${dist.bin}" includes="run.bat" eol="crlf"/>
  -        <chmod perm="+x">
  -            <fileset dir="${dist.bin}">
  -                <include name="run.sh"/>
  -                <include name="phoenix.sh"/>
  -            </fileset>
  -        </chmod>
  +      <echo message="Phoenix distribution present - adjusting linefeeds and 
permissions, copying files"/>
  +      <property name="dist.bin" value="${dist.dir}/bin"/>
  +      <fixcrlf srcdir="${phoenix.dir}/bin" includes="phoenix.sh" eol="lf"/>
  +      <copy todir="${dist.dir}">
  +        <fileset dir="${phoenix.dir}">
  +          <exclude name="CVS/**"/>
  +          <!-- exclude the thread and pool jars and use the candidate releases 
instead -->
  +          <exclude name="**/excalibur-thread-1.0.jar"/>
  +          <exclude name="**/excalibur-pool-1.0.jar"/>
  +        </fileset>
  +      </copy>
  +
  +      <copy todir="${dist.dir}/lib" flatten="true">
  +        <fileset dir="${candidates.dir}">
  +          <exclude name="CVS/**"/>
  +          <include name="excalibur-thread-1.1.jar"/>
  +          <include name="**/excalibur-pool-1.2.jar"/>
  +          <include name="**/commons-collections-2.1.jar"/>
  +        </fileset>
  +      </copy>
  +
  +      <fixcrlf srcdir="${dist.bin}" includes="run.sh" eol="lf"/>
  +      <fixcrlf srcdir="${dist.bin}" includes="run.bat" eol="crlf"/>
  +      <chmod perm="+x">
  +        <fileset dir="${dist.bin}">
  +          <include name="run.sh"/>
  +          <include name="phoenix.sh"/>
  +        </fileset>
  +      </chmod>
  +
       </target>
   
       <!--
  -       ===================================================================
  +    ===================================================================
                                      jdbc3 
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="prepare-jdbc3" depends="prepare-common" if="jdbc3.present">
           <echo message="JDBC v3 in classpath - making code JDBC 3.0 compliant"/>
           <replace file="${build.src}/${poolconn.file}" token="/* JDBC_3_ANT_KEY" 
value=""/>
  @@ -225,264 +172,280 @@
       </target>
   
       <!--
  -       ===================================================================
  +    ===================================================================
                                     Prepare target
  -       ===================================================================
  +    ===================================================================
       -->
       <target name="prepare" depends="prepare-common,prepare-phoenix,prepare-jdbc3"/>
   
       <!--
  -       ===================================================================
  +    ===================================================================
                                     compile
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="compile" depends="prepare">
  -    <echo message="Compiling James Java sources"/>
  -        <available property="jndi.present" classname="javax.naming.InitialContext"/>
  -        <mkdir dir="${build.classes}"/>
  -        <javac destdir="${build.classes}" debug="${debug}" optimize="${optimize}" 
deprecation="${deprecation}">
  -            <classpath refid="project.class.path"/>
  -            <src path="${build.src}"/>
  -            <src path="${java.dir}"/>
  -            <exclude name="${constants.file}"/>
  -            <exclude name="${poolconn.file}"/>
  -            <exclude 
name="org/apache/james/userrepository/UsersLDAPRepository.java" unless="jndi.present"/>
  -        </javac>
  -        <copy todir="${build.classes}">
  -            <fileset dir="${java.dir}">
  -                <include name="**/*.properties"/>
  -                <include name="**/*.xinfo"/>
  -                <include name="**/*.mxinfo"/>
  -            </fileset>
  -        </copy>
  +      <echo message="Compiling James Java sources"/>
  +      <available property="jndi.present" classname="javax.naming.InitialContext"/>
  +      <mkdir dir="${build.classes}"/>
  +      <javac destdir="${build.classes}" debug="${debug}" optimize="${optimize}" 
deprecation="${deprecation}">
  +        <classpath refid="project.class.path"/>
  +        <src path="${build.src}"/>
  +        <src path="${java.dir}"/>
  +        <exclude name="${constants.file}"/>
  +        <exclude name="${poolconn.file}"/>
  +        <exclude name="org/apache/james/userrepository/UsersLDAPRepository.java" 
unless="jndi.present"/>
  +      </javac>
  +      <copy todir="${build.classes}">
  +        <fileset dir="${java.dir}">
  +          <include name="**/*.properties"/>
  +          <include name="**/*.xinfo"/>
  +          <include name="**/*.mxinfo"/>
  +        </fileset>
  +      </copy>
       </target>
  +
       <!--
  -       ===================================================================
  +    ===================================================================
                                     Javadocs, and mailet javadocs
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="javadocs">
  -    <echo message="Making James Javadocs"/>
   
  -        <delete dir="${build.javadocs}"/>
  -        <mkdir dir="${build.javadocs}"/>
  -        <javadoc packagenames="org.apache.*" sourcepath="${java.dir}" 
destdir="${build.javadocs}">
  -            <classpath refid="project.class.path"/>
  -            <doclet name="com.sun.tools.doclets.standard.Standard">
  -                <param name="-author"/>
  -                <param name="-version"/>
  -                <param name="-use"/>
  -                <param name="-breakiterator"/>
  -                <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api"/>
  -                <param name="-link" 
value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api"/>
  -                <param name="-link" value="http://jakarta.apache.org/avalon/api"/>
  -                <param name="-link" 
value="http://jakarta.apache.org/avalon/phoenix/api"/>
  -                <param name="-link" 
value="http://jakarta.apache.org/avalon/cornerstone/api"/>
  -                <param name="-link" 
value="http://jakarta.apache.org/avalon/logkit/api"/>
  -                <param name="-doctitle" value="${Name} ${version}"/>
  -                <param name="-windowtitle" value="${Name} API"/>
  -                <param name="-bottom" value="&quot;Copyright &#169; ${year} Apache 
Jakarta Project. All Rights Reserved.&quot;"/>
  -            </doclet>
  -        </javadoc>
  -        <echo message="Making Mailet Javadocs"/>
  -        <javadoc packagenames="org.apache.mailet.*" sourcepath="${java.dir}" 
destdir="${build.dir}/mailet">
  -            <classpath refid="project.class.path"/>
  -            <doclet name="com.sun.tools.doclets.standard.Standard">
  -                <param name="-author"/>
  -                <param name="-version"/>
  -                <param name="-breakiterator"/>
  -                <param name="-use"/>
  -                <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api"/>
  -                <param name="-link" 
value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api"/>  
  -                <param name="-link" value="http://jakarta.apache.org/avalon/api"/>
  -                <param name="-link" 
value="http://jakarta.apache.org/avalon/phoenix/api"/>
  -                <param name="-link" 
value="http://jakarta.apache.org/avalon/cornerstone/api"/>
  -                <param name="-link" 
value="http://jakarta.apache.org/avalon/logkit/api"/>
  -                <param name="-doctitle" value="Apache Jakarta Mailet API"/>
  -                <param name="-windowtitle" value="Apache Jakarta Mailet API"/>
  -                <param name="-bottom" value="&quot;Copyright &#169; ${year} Apache 
Jakarta Project. All Rights Reserved.&quot;"/>
  -            </doclet>
  -        </javadoc>
  +      <echo message="Making James Javadocs"/>
  +
  +      <delete dir="${build.javadocs}"/>
  +      <mkdir dir="${build.javadocs}"/>
  +      <javadoc packagenames="org.apache.*" sourcepath="${java.dir}" 
destdir="${build.javadocs}">
  +        <classpath refid="project.class.path"/>
  +        <doclet name="com.sun.tools.doclets.standard.Standard">
  +          <param name="-author"/>
  +          <param name="-version"/>
  +          <param name="-use"/>
  +          <param name="-breakiterator"/>
  +          <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api"/>
  +          <param name="-link" 
value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api"/>
  +          <param name="-link" value="http://jakarta.apache.org/avalon/api"/>
  +          <param name="-link" value="http://jakarta.apache.org/avalon/phoenix/api"/>
  +          <param name="-link" 
value="http://jakarta.apache.org/avalon/cornerstone/api"/>
  +          <param name="-link" value="http://jakarta.apache.org/avalon/logkit/api"/>
  +          <param name="-doctitle" value="${Name} ${version}"/>
  +          <param name="-windowtitle" value="${Name} API"/>
  +          <param name="-bottom" value="&quot;Copyright &#169; ${year} Apache 
Jakarta Project. All Rights Reserved.&quot;"/>
  +        </doclet>
  +      </javadoc>
  +      <echo message="Making Mailet Javadocs"/>
  +      <javadoc packagenames="org.apache.mailet.*" sourcepath="${java.dir}" 
destdir="${build.dir}/mailet">
  +        <classpath refid="project.class.path"/>
  +        <doclet name="com.sun.tools.doclets.standard.Standard">
  +          <param name="-author"/>
  +          <param name="-version"/>
  +          <param name="-breakiterator"/>
  +          <param name="-use"/>
  +          <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api"/>
  +          <param name="-link" 
value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api"/>  
  +          <param name="-link" value="http://jakarta.apache.org/avalon/api"/>
  +          <param name="-link" value="http://jakarta.apache.org/avalon/phoenix/api"/>
  +          <param name="-link" 
value="http://jakarta.apache.org/avalon/cornerstone/api"/>
  +          <param name="-link" value="http://jakarta.apache.org/avalon/logkit/api"/>
  +          <param name="-doctitle" value="Apache Jakarta Mailet API"/>
  +          <param name="-windowtitle" value="Apache Jakarta Mailet API"/>
  +          <param name="-bottom" value="&quot;Copyright &#169; ${year} Apache 
Jakarta Project. All Rights Reserved.&quot;"/>
  +        </doclet>
  +      </javadoc>
       </target>
  +
       <!--
  -       ===================================================================
  +    ===================================================================
                                     build xdocs
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="xdocs" depends="prepare">
  -        <style style="${docs.src}/stylesheets/site.xsl"
  +      <style style="${docs.src}/stylesheets/site.xsl"
                   basedir="${docs.src}/"
                   destdir="${build.docs}/" 
                   includes="**/*.xml" >
  -        </style>
  -        <copy todir="${build.docs}" filtering="no">
  -            <fileset dir="${docs.src}">
  -                        <include name="**/*.css"/>
  -            </fileset>
  -        </copy>
  -        <copy todir="${build.docs}/images" filtering="no">
  -            <fileset dir="${docs.src}/images">
  -                <include name="**/*.gif"/>
  -                <include name="**/*.jpeg"/>
  -                <include name="**/*.jpg"/>
  -                <include name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -        <mkdir dir="${dist.dir}/docs"/>
  -        <copy todir="${dist.dir}/docs" filtering="no">
  -            <fileset dir="${build.docs}"/>
  -        </copy>
  +      </style>
  +      <copy todir="${build.docs}" filtering="no">
  +        <fileset dir="${docs.src}">
  +          <include name="**/*.css"/>
  +        </fileset>
  +      </copy>
  +      <copy todir="${build.docs}/images" filtering="no">
  +        <fileset dir="${docs.src}/images">
  +          <include name="**/*.gif"/>
  +          <include name="**/*.jpeg"/>
  +          <include name="**/*.jpg"/>
  +          <include name="**/*.png"/>
  +        </fileset>
  +      </copy>
  +      <mkdir dir="${dist.dir}/docs"/>
  +      <copy todir="${dist.dir}/docs" filtering="no">
  +        <fileset dir="${build.docs}"/>
  +      </copy>
       </target>
  +
       <!--
  -       ===================================================================
  +    ===================================================================
                                   build   website 
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="website" depends="xdocs,javadocs">
  -    <echo message="preparing website in ${www.dir}"/>
  -        <delete>
  -            <fileset dir="${www.dir}">
  -                <exclude name="CVS/**"/>
  -                <exclude name="rfclist/**"/>
  -                <exclude name="javadocs/**"/>
  -                <exclude name="mailet/**"/>
  -            </fileset>
  -        </delete>
  -        <mkdir dir="${www.dir}"/>
  -        <copy todir="${www.dir}" filtering="no">
  -            <fileset dir="${build.docs}"/>
  -        </copy>
  -        <copy todir="${www.dir}" filtering="no">
  -            <fileset dir="${build.dir}">
  -                <include name="javadocs/**"/>
  -                <include name="mailet/**"/>
  -            </fileset>
  -        </copy>
  -        <fixcrlf srcdir="${www.dir}" includes="**/*.html" eol="lf" tab="remove" 
tablength="4" />
  -        <fixcrlf srcdir="${www.dir}" includes="**/*.css" eol="lf" tab="remove" 
tablength="4" />
  +
  +      <echo message="preparing website in ${www.dir}"/>
  +      <delete>
  +        <fileset dir="${www.dir}">
  +          <exclude name="CVS/**"/>
  +          <exclude name="rfclist/**"/>
  +          <exclude name="javadocs/**"/>
  +          <exclude name="mailet/**"/>
  +        </fileset>
  +      </delete>
  +      <mkdir dir="${www.dir}"/>
  +      <copy todir="${www.dir}" filtering="no">
  +        <fileset dir="${build.docs}"/>
  +      </copy>
  +      <copy todir="${www.dir}" filtering="no">
  +        <fileset dir="${build.dir}">
  +          <include name="javadocs/**"/>
  +          <include name="mailet/**"/>
  +        </fileset>
  +      </copy>
  +      <fixcrlf srcdir="${www.dir}" includes="**/*.html" eol="lf" tab="remove" 
tablength="4" />
  +      <fixcrlf srcdir="${www.dir}" includes="**/*.css" eol="lf" tab="remove" 
tablength="4" />
       </target>
  +
       <!--
  -       ===================================================================
  +    ===================================================================
                   Build everything
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="everything" 
depends="clean,website,dist-bin,dist-src,dist-mailet-SDK"/>
  +
       <!--
  -       ===================================================================
  +    ===================================================================
                                     Build all distributions
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="dist" depends="dist-bin,dist-src,dist-mailet-SDK"/>
  +
       <!--
  -       ===================================================================
  +    ===================================================================
                                     Make james.sar
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="sar" depends="compile">
  -    <echo message="Making James Sarfile (james.sar)"/>
   
  -        <!-- builds james-sar-->
  -        <mkdir dir="${build.lib}"/>
  -        <!-- Make james.jar-->
  -        <jar jarfile="${build.lib}/${name}.jar" basedir="${build.classes}" 
manifest="${src.dir}/Manifest.mf">
  -            <include name="org/apache/james/**"/>
  -            <include name="org/apache/mailet/**"/>
  -        </jar>
  -        <!-- Make sar file-->
  -        <sar sarfile="${build.lib}/${name}.sar" 
config="${conf.dir}/james-config.xml" environment="${conf.dir}/james-server.xml" 
assembly="${conf.dir}/james-assembly.xml">
  -            <lib dir="${build.lib}/">
  -                <include name="*.jar"/>
  -            </lib>
  -            <lib dir="lib">
  -                <include name="dnsjava-1.3.2.jar"/>
  -                <include name="jakarta-oro-2.0.1.jar"/>
  -                <include name="mm.mysql-2.0.14.jar"/>
  -                <include name="mm.mysql.LICENCE"/>
  -                <include name="avalon-framework-4.1.3.jar"/>
  -                <!--<include name="cornerstone.jar"/>-->
  -                <include name="excalibur-datasource-1.0.jar"/>
  -                <include name="activation.jar"/>
  -                <include name="mail_1_3.jar"/>
  -                <include name="commons-net-1.0.0-dev.jar"/>
  -            </lib>
  -            <lib dir="lib/candidates">
  -                <include name="excalibur-thread-1.1.jar"/>
  -                <include name="excalibur-pool-1.2.jar"/>
  -                <include name="commons-collections-2.1.jar"/>
  -                <include name="cornerstone-threads-1.0.jar"/>
  -                <include name="cornerstone-connection-1.0.jar"/>
  -                <include name="cornerstone-store-1.0.jar"/>
  -                <include name="cornerstone-scheduler-1.0.jar"/>
  -                <include name="cornerstone-sockets-1.0.jar"/>
  -                <include name="cornerstone-datasources-1.0.jar"/>
  -            </lib>
  -            <zipfileset dir="${conf.dir}" fullpath="conf/sqlResources.xml">
  -                <include name="sqlResources.xml"/>
  -            </zipfileset>
  -        </sar>
  +      <echo message="Making James Sarfile (james.sar)"/>
  +
  +      <!-- builds james-sar-->
  +      <mkdir dir="${build.lib}"/>
  +      <!-- Make james.jar-->
  +      <jar jarfile="${build.lib}/${name}.jar" basedir="${build.classes}" 
manifest="${src.dir}/Manifest.mf">
  +        <include name="org/apache/james/**"/>
  +        <include name="org/apache/mailet/**"/>
  +      </jar>
  +      <!-- Make sar file-->
  +      <sar sarfile="${build.lib}/${name}.sar" config="${conf.dir}/james-config.xml" 
  +             environment="${conf.dir}/james-server.xml" 
assembly="${conf.dir}/james-assembly.xml">
  +        <lib dir="${build.lib}/">
  +          <include name="*.jar"/>
  +        </lib>
  +        <lib dir="lib">
  +          <include name="dnsjava-1.3.2.jar"/>
  +          <include name="jakarta-oro-2.0.1.jar"/>
  +          <include name="mm.mysql-2.0.14.jar"/>
  +          <include name="mm.mysql.LICENCE"/>
  +          <include name="avalon-framework-4.1.3.jar"/>
  +          <!--<include name="cornerstone.jar"/>-->
  +          <include name="excalibur-datasource-1.0.jar"/>
  +          <include name="activation.jar"/>
  +          <include name="mail_1_3.jar"/>
  +          <include name="commons-net-1.0.0-dev.jar"/>
  +        </lib>
  +        <lib dir="lib/candidates">
  +          <!--<include name="excalibur-thread-1.1.jar"/>-->
  +          <include name="excalibur-pool-1.2.jar"/>
  +          <include name="commons-collections-2.1.jar"/>
  +          <include name="cornerstone-threads-1.0.jar"/>
  +          <include name="cornerstone-connection-1.0.jar"/>
  +          <include name="cornerstone-store-1.0.jar"/>
  +          <include name="cornerstone-scheduler-1.0.jar"/>
  +          <include name="cornerstone-sockets-1.0.jar"/>
  +          <include name="cornerstone-datasources-1.0.jar"/>
  +        </lib>
  +        <zipfileset dir="${conf.dir}" fullpath="conf/sqlResources.xml">
  +          <include name="sqlResources.xml"/>
  +        </zipfileset>
  +      </sar>
       </target>
  +
       <!--
  -       ===================================================================
  +    ===================================================================
                                     Make dist directory with unpacked dist ready to 
run
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="dist-lite" depends="sar">
  -    <echo message="Installing James to ${dist.dir}"/>
   
  -        <!--installs sar into ./dist/ ready to test-->
  -        <copy file="${build.lib}/${name}.sar" todir="${dist.dir}/apps"/>
  +      <echo message="Installing James to ${dist.dir}"/>
  +
  +      <!--installs sar into ./dist/ ready to test-->
  +      <copy file="${build.lib}/${name}.sar" todir="${dist.dir}/apps"/>
           
  -        <!-- Make mailet.jar-->
  -        <jar jarfile="${build.lib}/mailet.jar" basedir="${build.classes}" 
manifest="${src.dir}/Manifest.mf" includes="org/apache/mailet/**"/>
  -        <!-- copy file="${build.lib}/mailet.jar" todir="${dist.dir}/lib"/ -->
  +      <!-- Make mailet.jar-->
  +      <jar jarfile="${build.lib}/mailet.jar" 
  +               basedir="${build.classes}" 
  +               manifest="${src.dir}/Manifest.mf" 
  +               includes="org/apache/mailet/**"/>
  +          <!-- copy file="${build.lib}/mailet.jar" todir="${dist.dir}/lib"/ -->
       </target>
  +
       <!--
  -       ===================================================================
  +    ===================================================================
                                     binary distributions
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
   
       <target name="dist-bin-phoenix-warn" depends="dist-bin-common" 
unless="phoenix.bin.present">
           <echo message ="The Phoenix distribution is not present - the James 
w/Phoenix binary distribution will not be built."/>
       </target>
   
       <target name="dist-bin-phoenix" depends="dist-bin-common" 
if="phoenix.bin.present">
  -        <echo message ="Building binary w/Phoenix distributions"/>
  -        <zip zipfile="${dist.binary.dir}/${name}-binary-${version}.zip">
  -            <fileset dir="dist">
  -                <include name="${name}-${version}/**"/>
  -                <exclude name="${name}-${version}/downloads/**"/>
  -                <include name="release-notes.txt"/>
  -                <include name="LICENSE.txt"/>
  -            </fileset>
  -        </zip>
  -        <tar longfile="gnu" 
tarfile="${dist.binary.dir}/${name}-binary-${version}.tar">
  -            <tarfileset dir="dist" username="${name}" group="${name}">
  -                <include name="${name}-${version}/**"/>
  -                <exclude name="${name}-${version}/downloads/**"/>
  -                <include name="release-notes.txt"/>
  -                <include name="LICENSE.txt"/>
  -            </tarfileset>
  -        </tar>
  -        <gzip zipfile="${dist.binary.dir}/${name}-binary-${version}.tar.gz" 
src="${dist.binary.dir}/${name}-binary-${version}.tar"/>
  -        <delete file="${dist.binary.dir}/${name}-binary-${version}.tar"/>
  +      <echo message ="Building binary w/Phoenix distributions"/>
  +      <zip zipfile="${dist.binary.dir}/${name}-binary-${version}.zip">
  +        <fileset dir="dist">
  +          <include name="${name}-${version}/**"/>
  +          <exclude name="${name}-${version}/downloads/**"/>
  +          <include name="release-notes.txt"/>
  +          <include name="LICENSE.txt"/>
  +        </fileset>
  +      </zip>
  +      <tar longfile="gnu" 
tarfile="${dist.binary.dir}/${name}-binary-${version}.tar">
  +        <tarfileset dir="dist" username="${name}" group="${name}">
  +          <include name="${name}-${version}/**"/>
  +          <exclude name="${name}-${version}/downloads/**"/>
  +          <include name="release-notes.txt"/>
  +          <include name="LICENSE.txt"/>
  +        </tarfileset>
  +      </tar>
  +      <gzip zipfile="${dist.binary.dir}/${name}-binary-${version}.tar.gz" 
src="${dist.binary.dir}/${name}-binary-${version}.tar"/>
  +      <delete file="${dist.binary.dir}/${name}-binary-${version}.tar"/>
       </target>
   
       <target name="dist-bin-common" depends="dist-lite,xdocs,javadocs">
  -        <echo message ="Building binary distributions"/>
  -        <property name="dist.binary.dir" value="${dist.dir}/downloads/bin"/>
  -        <mkdir dir="${dist.binary.dir}"/>
  -        <!-- Sar only-->
  -        <copy file="${dist.dir}/apps/${name}.sar" todir="${dist.binary.dir}"/>
  +      <echo message ="Building binary distributions"/>
  +      <property name="dist.binary.dir" value="${dist.dir}/downloads/bin"/>
  +      <mkdir dir="${dist.binary.dir}"/>
  +      <!-- Sar only-->
  +      <copy file="${dist.dir}/apps/${name}.sar" todir="${dist.binary.dir}"/>
       </target>
   
       <target name="dist-bin" 
depends="dist-bin-common,dist-bin-phoenix-warn,dist-bin-phoenix"/>
   
       <!--
  -       ===================================================================
  +    ===================================================================
                                     source distributions
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="dist-src-phoenix-warn" depends="dist-src-common" 
unless="phoenix.bin.present">
           <echo message ="The Phoenix distribution is not present - the James source 
distribution with Phoenix binaries will not be built."/>
       </target>
  @@ -527,7 +490,8 @@
                   <include name="www/**"/>
               </tarfileset>
           </tar>
  -        <gzip 
zipfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar.gz" 
src="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar"/>
  +        <gzip 
zipfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar.gz" 
  +             src="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar"/>
           <delete file="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar"/>
       </target>
   
  @@ -573,11 +537,12 @@
       <target name="dist-src" 
depends="dist-src-common,dist-src-phoenix-warn,dist-src-phoenix"/>
   
       <!--
  -       ===================================================================
  +    ===================================================================
                                     Mailet SDK distribution
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="dist-mailet-SDK" depends="dist-lite,xdocs,javadocs">
  +
           <echo message ="building mailet SDK distributions"/>
   
           <mkdir dir="${dist.dir}/MailetSDK/src"/>
  @@ -604,24 +569,27 @@
                   <exclude name="${name}-${version}/downloads/**"/>
               </tarfileset>
           </tar>
  -        <gzip 
zipfile="${dist.dir}/downloads/bin/${name}-MailetSDK-${version}.tar.gz" 
src="${dist.dir}/downloads/bin/${name}-MailetSDK-${version}.tar"/>
  +        <gzip 
zipfile="${dist.dir}/downloads/bin/${name}-MailetSDK-${version}.tar.gz" 
  +            src="${dist.dir}/downloads/bin/${name}-MailetSDK-${version}.tar"/>
           <delete file="${dist.dir}/downloads/bin/${name}-MailetSDK-${version}.tar"/>
           <delete dir="${dist.dir}/MailetSDK"/>
       </target>
       <!--
  -       ===================================================================
  +    ===================================================================
                                     delete dist/ and build/
  -       ===================================================================
  -  -->
  +    ===================================================================
  +    -->
       <target name="clean">
           <echo message ="deleting working directories ready for a clean build"/>
  -
           <delete dir="${dist.dir}"/>
           <delete dir="${build.dir}"/>
       </target>
  -    <!-- =================================================================== -->
  -    <!-- Help on usage                                                       -->
  -    <!-- =================================================================== -->
  +
  +    <!--
  +    ===================================================================
  +                                   Help on usage                                    
                   
  +    =================================================================== 
  +    -->
       <target name="usage">
           <echo message=""/>
           <echo message=""/>
  @@ -643,4 +611,5 @@
           <echo message=""/>
           <echo message=""/>
       </target>
  -    </project>
  +  
  +</project>
  
  
  
  1.1                  jakarta-james/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  # Specifies default property values
  # Overridden by ../default.properties and all ant.properties
  # Not user-editable; use ant.properties files instead
  
  name=james
  Name=James Mail Server
  version=3.0a1
  #package-version=3.0a1
  year=1999-2003
  extension.name=org.apache.james
  vendor=Apache Software Foundation
  
  
  
  #
  # compiler options
  # (There should be no need to override default compiler but need to change
  # javac task to run without this}
  
  build.compiler = modern
  
  #
  # compiler switches
  # (these are here only for those who use jikes compiler)
  #
  
  build.compiler.emacs = on
  build.compiler.pedantic = true
  build.compiler.depend = true
  build.compiler.fulldepend = true
  
  #
  # standard comiler switches
  #
  
  debug = on
  optimize = on
  deprecation = off
  
  #
  # the relative base directory
  #
  
  james.dir = ${basedir}
  
  #
  #  location of intermediate products
  #
  
  build.dir = ${james.dir}/build
  build.lib = ${build.dir}/lib
  build.src = ${build.dir}/src
  build.classes = ${build.dir}/classes
  build.javadocs = ${build.docs}/javadocs
  build.docs = ${build.dir}/docs
  build.mailetdocs = ${build.dir}/mailetdocs
  build.conf = ${build.dir}/conf
  
  #
  # source properties
  #
  
  src.dir=${james.dir}/src
  java.dir=${src.dir}/java
  conf.dir=${src.dir}/conf
  xdocs.dir=${src.dir}/xdocs
  docs.src=${xdocs.dir}
  constants.file = org/apache/james/Constants.java
  poolconn.file = org/apache/james/util/mordred/PoolConnEntry.java
  
  #
  #  distribution directories
  #
  
  dist.base = ${james.dir}/dist
  dist.name = ${name}-${version}
  dist.dir = ${dist.base}/${dist.name}
  
  #
  #  third party binary directories
  #
  
  lib.dir = ${james.dir}/lib
  phoenix.dir = ${james.dir}/phoenix-bin
  phoenix.lib.dir = ${phoenix.dir}/lib
  candidates.dir = ${lib.dir}/candidates
  
  #
  #  properties for the website directories
  #
  
  www.dir = ${james.dir}/www
  
  
  # --------------------------------------------------
  #                REQUIRED LIBRARIES
  # --------------------------------------------------
  
  # ----- Xerces ---------------
  xerces.jar = ${lib.dir}/xerces-1.4.3.jar
  
  # ----- Avalon Framework -----
  avalon-framework.jar=${phoenix-lib}/avalon-framework-4.1.3.jar
  
  # ----- Cornerstone threads, version 1.0 or later -----
  cornerstone-threads.jar=${candidates}/cornerstone-threads-1.0.jar
  
  # ----- Cornerstone connection, version 1.0 or later -----
  cornerstone-connection.jar=${candidates}/cornerstone-connection-1.0.jar
  
  # ----- Cornerstone masterstore, version 1.0 or later -----
  cornerstone-store.jar=${candidates}/cornerstone-store-1.0.jar
  
  # ----- Cornerstone sockets, version 1.0 or later -----
  cornerstone-sockets.jar=${candidates}/cornerstone-sockets-1.0.jar
  
  # ----- Cornerstone scheduler, version 1.0 or later -----
  cornerstone-scheduler.jar=${candidates}/cornerstone-scheduler-1.0.jar
  
  # ----- Cornerstone scheduler, version 1.0 or later -----
  cornerstone-datasources.jar=${candidates}/cornerstone-datasources-1.0.jar
  
  # ----- Excalibur collections, version 1.0 or later -----
  excalibur-collections.jar=${phoenix-lib}/excalibur-collections-1.0.jar
  
  # ----- Excalibur threadcontext, version 1.0 or later -----
  excalibur-threadcontext.jar=${phoenix-lib}/excalibur-threadcontext-1.0.jar
  
  # ----- Excalibur cli -----
  excalibur-cli.jar=${phoenix-lib}/excalibur-cli-1.0.jar
  
  # ----- Excalibur thread, version 1.0 or later -----
  excalibur-thread.jar=${candidates}/excalibur-thread-1.1.jar
  
  # ----- Excalibur pool -----
  excalibur-pool.jar=${candidates}/excalibur-pool-1.2.jar
  
  # ----- Excalibur datasource -----
  excalibur-datasource.jar=${lib}/excalibur-datasource-1.0.jar
  
  # ----- Excalibur datasource -----
  excalibur-io.jar=${phoenix-lib}/excalibur-io-1.1.jar
  
  # ----- Javax mail -----
  javax-mail.jar=${lib}/mail_1_3.jar
  
  # ----- Activation -----
  javax-activation.jar=${lib}/activation.jar
  
  # ----- DNS -----
  dns.jar=${lib}/dnsjava-1.3.2.jar
  
  # ----- Commons Net -----
  commons-net.jar=${lib}/commons-net-1.0.0-dev.jar
  
  # ----- Jakarta ORO -----
  jakarta-oro.jar=${lib}/jakarta-oro-2.0.1.jar
  
  # ----- Commons Collections -----
  commons-collections.jar=${candidates}/commons-collections-2.1.jar
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to