noel        2003/07/25 17:17:21

  Modified:    .        build.xml
  Log:
  (1) Fixed jar paths that caused james and mailet jars from not being included in the 
sar.  (2) updated to refer to JavaMail 1.3.1.  (3) Don't build anachronistic 
'mailet.jar' file.
  
  Revision  Changes    Path
  1.134     +10 -17    james-server/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/james-server/build.xml,v
  retrieving revision 1.133
  retrieving revision 1.134
  diff -u -r1.133 -r1.134
  --- build.xml 13 Jul 2003 05:56:52 -0000      1.133
  +++ build.xml 26 Jul 2003 00:17:21 -0000      1.134
  @@ -8,14 +8,7 @@
    James build file $Revision$  Committed on $Date$ by: $Author$
   
   Authors:
  - Federico Barbieri <[EMAIL PROTECTED]>
  - Serge
  - Charles Benett    <[EMAIL PROTECTED]>
  - Peter Donald      <[EMAIL PROTECTED]>
  - Harmeet Bedi      <[EMAIL PROTECTED]>
  - Danny Angus       <[EMAIL PROTECTED]>
  - Peter M. Goldstein <[EMAIL PROTECTED]>
  - Stephen McConnell  <[EMAIL PROTECTED]>
  + James Project <[EMAIL PROTECTED]>
   
   Legal:
     Copyright (c) 1999-2003 The Apache Software Foundation. All Rights Reserved.
  @@ -389,13 +382,13 @@
         <mkdir dir="${build.lib}"/>
   
         <!-- Make mailet api jar-->
  -      <echo message="Making Mailet API Jar (mailet-api-1.0.jar)"/>
  +      <echo message="Making Mailet API Jar (mailet-api-${mailet-api-version}.jar)"/>
         <jar jarfile="${build.lib}/mailet-api-${mailet-api-version}.jar" 
                  basedir="${build.classes}" 
                  
includes="org/apache/mailet/Mailet.class,org/apache/mailet/MailetConfig.class,org/apache/mailet/Mail.class,org/apache/mailet/MailetContext.class,org/apache/mailet/MailAddress.class,org/apache/mailet/MailRepository,org/apache/mailet/SpoolRepository,org/apache/mailet/UserRepository,org/apache/mailet/Datasource,org/apache/mailet/User"/>
   
         <!-- Make mailet implementation jar-->
  -      <echo message="Making Mailet Jar (mailet-1.0.jar)"/>
  +      <echo message="Making Mailet Jar (mailet-${mailet-version}.jar)"/>
         <jar jarfile="${build.lib}/mailet-${mailet-version}.jar" 
                  basedir="${build.classes}" 
                  includes="org/apache/mailet/**"
  @@ -423,9 +416,9 @@
         <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="${build.lib}/mailet-api-${mailet-api-version}.jar"/>
  -          <include name="${build.lib}/mailet-${mailet-version}.jar"/>
  -          <include name="${build.lib}/james-${version}.jar"/>
  +          <include name="mailet-api-${mailet-api-version}.jar"/>
  +          <include name="mailet-${mailet-version}.jar"/>
  +          <include name="james-${version}.jar"/>
           </lib>
           <lib dir="lib">
             <include name="dnsjava-1.3.2.jar"/>
  @@ -436,7 +429,7 @@
             <!--<include name="cornerstone.jar"/>-->
             <include name="excalibur-datasource-1.0.jar"/>
             <include name="activation.jar"/>
  -          <include name="mail_1_3.jar"/>
  +          <include name="mail-1.3.1.jar"/>
             <include name="commons-net-1.0.0-dev.jar"/>
           </lib>
           <lib dir="lib/candidates">
  @@ -469,10 +462,10 @@
         <copy file="${build.lib}/${name}.sar" todir="${dist.dir}/apps"/>
           
         <!-- Make mailet.jar-->
  -      <jar jarfile="${build.lib}/mailet.jar" 
  +      <!-- jar jarfile="${build.lib}/mailet.jar" 
                  basedir="${build.classes}" 
                  manifest="${src.dir}/Manifest.mf" 
  -               includes="org/apache/mailet/**"/>
  +               includes="org/apache/mailet/**"/ -->
             <!-- copy file="${build.lib}/mailet.jar" todir="${dist.dir}/lib"/ -->
       </target>
   
  
  
  

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

Reply via email to