You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by se...@apache.org on 2004/03/21 05:43:19 UTC

cvs commit: james-server LICENSE.txt NOTICE.txt build.xml

serge       2004/03/20 20:43:19

  Modified:    .        build.xml
  Added:       .        LICENSE.txt NOTICE.txt
  Log:
  Include ASF 2.0 license and include it in source and binary distributions.
  
  Revision  Changes    Path
  1.144     +35 -27    james-server/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/james-server/build.xml,v
  retrieving revision 1.143
  retrieving revision 1.144
  diff -u -r1.143 -r1.144
  --- build.xml	21 Feb 2004 17:33:40 -0000	1.143
  +++ build.xml	21 Mar 2004 04:43:18 -0000	1.144
  @@ -44,7 +44,7 @@
       Set the properties for build tools directory
       ===================================================================
        -->
  -     
  +
       <property name="tools.dir" value="tools"/>
       <property name="tools.lib.dir" value="${tools.dir}/lib"/>
   
  @@ -88,12 +88,12 @@
               <include name="*.jar"/>
           </fileset>
       </path>
  -    
  +
       <taskdef name="phoenix-mxinfo" classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet">
  -        <classpath refid="tools.class.path"/>        
  +        <classpath refid="tools.class.path"/>
       </taskdef>
   
  -    
  +
       <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
           <classpath refid="tools.class.path"/>
       </taskdef>
  @@ -202,7 +202,7 @@
   
       <!--
       ===================================================================
  -                                   jmx 
  +                                   jmx
       ===================================================================
       -->
       <target name="prepare-mxinfo">
  @@ -216,7 +216,7 @@
   
       <!--
       ===================================================================
  -                                   jdbc3 
  +                                   jdbc3
       ===================================================================
       -->
       <target name="prepare-jdbc3" depends="prepare-common" if="jdbc3.present">
  @@ -238,7 +238,7 @@
       ===================================================================
       -->
       <target name="compile" depends="compile-main, compile-proposal"/>
  -    
  +
       <target name="compile-main" depends="prepare">
         <echo message="Compiling James Java sources"/>
         <available property="jndi.present" classname="javax.naming.InitialContext"/>
  @@ -320,7 +320,7 @@
             <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://java.sun.com/j2ee/sdk_1.3/techdocs/api"/>
             <param name="-link" value="http://avalon.apache.org/api"/>
             <param name="-link" value="http://avalon.apache.org/phoenix/api"/>
             <param name="-link" value="http://avalon.apache.org/cornerstone/api"/>
  @@ -340,7 +340,7 @@
       <target name="xdocs" depends="prepare">
         <style style="${docs.src}/stylesheets/site.xsl"
                   basedir="${docs.src}/"
  -                destdir="${build.docs}/" 
  +                destdir="${build.docs}/"
                   includes="**/*.xml" >
         </style>
         <copy todir="${build.docs}" filtering="no">
  @@ -364,7 +364,7 @@
   
       <!--
       ===================================================================
  -                                build   website 
  +                                build   website
       ===================================================================
       -->
       <target name="website" depends="xdocs,javadocs">
  @@ -418,14 +418,14 @@
   
         <!-- Make mailet api 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}" 
  +      <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,org/apache/mailet/MailetException"/>
   
         <!-- Make mailet implementation jar-->
         <echo message="Making Mailet Jar (mailet-${mailet-version}.jar)"/>
  -      <jar jarfile="${build.lib}/mailet-${mailet-version}.jar" 
  -               basedir="${build.classes}" 
  +      <jar jarfile="${build.lib}/mailet-${mailet-version}.jar"
  +               basedir="${build.classes}"
                  includes="org/apache/mailet/**"
                  excludes="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,org/apache/mailet/MailetException"/>
   
  @@ -448,7 +448,7 @@
         <echo message="Making James Sarfile (james.sar)"/>
   
         <!-- Make sar file-->
  -      <sar sarfile="${build.lib}/${name}.sar" config="${conf.dir}/james-config.xml" 
  +      <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="mailet-api-${mailet-api-version}.jar"/>
  @@ -485,7 +485,7 @@
             <include name="cornerstone-sockets-impl-1.0.jar"/>
             <include name="cornerstone-datasources-api-1.0.jar"/>
             <include name="cornerstone-datasources-impl-1.0.jar"/>
  -          
  +
           </lib>
           <zipfileset dir="${conf.dir}" fullpath="conf/sqlResources.xml">
             <include name="sqlResources.xml"/>
  @@ -495,7 +495,7 @@
           </zipfileset>
           <zipfileset dir="${conf.dir}/samples/fetchmail" prefix="conf/samples/fetchmail">
             <include name="*.xml"/>
  -        </zipfileset>                
  +        </zipfileset>
         </sar>
       </target>
   
  @@ -510,11 +510,11 @@
   
         <!--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" 
  +      <!-- 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>
  @@ -583,6 +583,8 @@
                   <include name="*.xml"/>
                   <include name="KEYS"/>
                   <include name="README"/>
  +                <include name="LICENSE.txt"/>
  +                <include name="NOTICE.txt"/>
                   <include name="build.*"/>
                   <include name="lib/**"/>
                   <include name="${phoenix.dir}/**"/>
  @@ -601,6 +603,8 @@
                   <include name="*.xml"/>
                   <include name="KEYS"/>
                   <include name="README"/>
  +                <include name="LICENSE.txt"/>
  +                <include name="NOTICE.txt"/>
                   <include name="build.*"/>
                   <include name="lib/**"/>
                   <include name="${phoenix.dir}/**"/>
  @@ -610,7 +614,7 @@
                   <include name="www/**"/>
               </tarfileset>
           </tar>
  -        <gzip zipfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar.gz" 
  +        <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>
  @@ -632,6 +636,8 @@
                   <include name="*.txt"/>
                   <include name="README"/>
                   <include name="KEYS"/>
  +                <include name="LICENSE.txt"/>
  +                <include name="NOTICE.txt"/>
                   <include name="build.*"/>
               </fileset>
           </zip>
  @@ -647,6 +653,8 @@
                   <include name="*.txt"/>
                   <include name="README"/>
                   <include name="KEYS"/>
  +                <include name="LICENSE.txt"/>
  +                <include name="NOTICE.txt"/>
                   <include name="build.*"/>
               </tarfileset>
           </tar>
  @@ -689,7 +697,7 @@
                   <exclude name="${name}-${version}/downloads/**"/>
               </tarfileset>
           </tar>
  -        <gzip zipfile="${dist.dir}/downloads/bin/${name}-MailetSDK-${version}.tar.gz" 
  +        <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"/>
  @@ -707,8 +715,8 @@
   
       <!--
       ===================================================================
  -                                   Help on usage                                                       
  -    =================================================================== 
  +                                   Help on usage
  +    ===================================================================
       -->
       <target name="usage">
           <echo message=""/>
  @@ -731,5 +739,5 @@
           <echo message=""/>
           <echo message=""/>
       </target>
  -  
  +
   </project>
  
  
  
  1.3       +175 -57   james-server/LICENSE.txt
  
  
  
  
  1.1                  james-server/NOTICE.txt
  
  Index: NOTICE.txt
  ===================================================================
     =========================================================================
     ==  NOTICE file for use with the Apache License, Version 2.0,  ==
     =========================================================================
  
     This product includes software developed by
     The Apache Software Foundation (http://www.apache.org/).
  
     This product also includes software developed by :
       - the W3C consortium (http://www.w3c.org/),
       - the SAX project (http://www.saxproject.org/)
       - the ISO-RELAX project (http://iso-relax.sourceforge.net/)
       - the Thai Open Source Software Center Ltd. 
         (http://www.thaiopensource.com/relaxng/jing.html)
       - the MX4J project (http://mx4j.sourceforge.net/)
       - Sun Microsystems (http://java.sun.com/)
       - the MySQL project (http://mmmysql.sourceforge.net/)
       - the dnsjava project (http://www.dnsjava.org/)
  
     The source version of this product includes software used exclusively 
     during the build process developed by the following:
       - the JUnit project (http://www.junit.org/)
       - the JDOM project (http://www.jdom.org/)
       - the XDoclet project (http://xdoclet.sourceforge.net/)
  
     Please read the different LICENSE files present in the root directory of
     this distribution.   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org