You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2003/03/01 03:38:58 UTC

cvs commit: avalon-logkit LICENSE.txt build.xml LICENSE

donaldp     2003/02/28 18:38:58

  Modified:    .        build.xml
  Added:       .        LICENSE.txt
  Removed:     .        LICENSE
  Log:
  Add .txt sufix to license
  
  Revision  Changes    Path
  1.98      +27 -27    avalon-logkit/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/build.xml,v
  retrieving revision 1.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- build.xml	23 Feb 2003 18:42:36 -0000	1.97
  +++ build.xml	1 Mar 2003 02:38:58 -0000	1.98
  @@ -120,7 +120,7 @@
     &check-targets;
   
     <!-- defer to check-targets.ent for figuring out dependencies -->
  -  <target name="check-dependencies" 
  +  <target name="check-dependencies"
             depends="jdk14-check,
                      javamail-check,
                      jdbc-check,
  @@ -130,9 +130,9 @@
                      servletapi-check"/>
   
     <!-- defer to check-targets.ent for downloading dependencies -->
  -  <target name="import-dependencies" 
  +  <target name="import-dependencies"
             depends="import-junit,import-log4j"/>
  -  
  +
     <!-- Main target -->
     <target name="main" depends="jar" description="Build complete"/>
   
  @@ -170,30 +170,30 @@
            latest of everything and just download that! -->
       <mkdir dir="${avalon-site.dir}"/>
       <mkdir dir="${avalon-site.dir}/lib"/>
  -    
  +
       <get src="http://www.ibiblio.org/maven/ant/jars/ant-1.4.1.jar"
           dest="${avalon-site.dir}/lib/ant-1.4.1.jar"
           verbose="true"
           usetimestamp="true"/>
  -      
  +
       <get src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.0.jar"
           dest="${avalon-site.dir}/lib/commons-collections-2.0.jar"
           verbose="true"
           usetimestamp="true"/>
  -      
  +
       <get src="http://www.ibiblio.org/maven/jdom/jars/jdom-b8.jar"
           dest="${avalon-site.dir}/lib/jdom-b8.jar"
           verbose="true"
           usetimestamp="true"/>
  -      
  +
       <get src="http://www.ibiblio.org/maven/jdom/jars/jdom-b8.jar"
           dest="${avalon-site.dir}/lib/jdom-b8.jar"
           verbose="true"
           usetimestamp="true"/>
  -    
  +
       <copy file="${lib.dir}/log4j-1.2.7.jar"
           tofile="${avalon-site.dir}/lib/log4j-1.2.7.jar"/>
  -	
  +
       <get src="http://www.ibiblio.org/maven/velocity/jars/velocity-1.4-dev.jar"
           dest="${avalon-site.dir}/lib/velocity-1.4-dev.jar"
           verbose="true"
  @@ -206,7 +206,7 @@
   
     </target>
   
  -  <target name="optional-tests" 
  +  <target name="optional-tests"
             description="Tests for classes missing to the environment">
       <available property="avalon-site.present"
                  file="${avalon-site.dir}/lib/velocity-1.4-dev.jar"
  @@ -223,7 +223,7 @@
       <echo>*  Recovery:</echo>
       <echo>*  Set the avalon-site.dir property in either</echo>
       <echo>*  ant.properties or ${user.home}/.ant.properties to</echo>
  -    <echo>*  point at your cvs checkout of avalon-site, or run</echo> 
  +    <echo>*  point at your cvs checkout of avalon-site, or run</echo>
       <echo>*  the build target import-avalon-site and it will</echo>
       <echo>*  check out the required parts of avalon-site into the</echo>
       <echo>*  parent directory.</echo>
  @@ -233,7 +233,7 @@
       <echo>*</echo>
       <echo>******************************************************</echo>
       <echo/>
  -    
  +
       <mkdir dir="${avalon-site.dir}/lib"/>
     </target>
   
  @@ -243,12 +243,12 @@
       <mkdir dir="${build.dir}"/>
       <mkdir dir="${build.classes}"/>
     </target>
  -  
  +
     <!-- Prepares the build directory -->
  -  <target name="compile" 
  -          depends="setup-properties,setup-dependencies,prepare" 
  +  <target name="compile"
  +          depends="setup-properties,setup-dependencies,prepare"
             description="Compile project">
  -          
  +
   
       <javac srcdir="${java.dir}"
              destdir="${build.classes}"
  @@ -274,16 +274,16 @@
                  unless="javax.sql.present"/>
         <exclude name="org/apache/log/output/lf5/**"
                  unless="log4j.present"/>
  -               
  +
         <!-- leave out test cases if junit not installed -->
         <exclude name="org/apache/log/util/test/**"
                  unless="junit.present"/>
         <exclude name="org/apache/log/test/**"
                  unless="junit.present"/>
         <exclude name="org/apache/log/output/test/**"
  -               unless="junit.present"/>               
  +               unless="junit.present"/>
         <exclude name="org/apache/log/format/test/**"
  -               unless="junit.present"/>               
  +               unless="junit.present"/>
       </javac>
   
       <copy todir="${build.classes}">
  @@ -436,7 +436,7 @@
               velocity.jar is in your classpath. The easiest way to build
               the documentation is to checkout avalon-site CVS and specify
               avalon-site.dir property.
  -	    
  +
   	    You can also run the build target import-avalon-site, to do
   	    this automatically.
           </echo>
  @@ -491,15 +491,15 @@
       </delete>
   
       <mkdir dir="${www.dir}"/>
  -    
  +
       <copy todir="${www.dir}">
         <fileset dir="${docs.dir}" />
       </copy>
  -    
  +
       <copy todir="${www.dir}/api">
         <fileset dir="${build.javadocs}" />
       </copy>
  -  
  +
   
     </target>
   
  @@ -526,9 +526,9 @@
   
       <copy todir="${dist.dir}">
         <fileset dir=".">
  -        <include name="README"/>
  +        <include name="README.txt"/>
           <include name="KEYS"/>
  -        <include name="LICENSE"/>
  +        <include name="LICENSE.txt"/>
         </fileset>
       </copy>
   
  @@ -570,9 +570,9 @@
   
       <copy todir="${src.dist.dir}">
         <fileset dir=".">
  -        <include name="README"/>
  +        <include name="README.txt"/>
           <include name="KEYS"/>
  -        <include name="LICENSE"/>
  +        <include name="LICENSE.txt"/>
           <include name="build.xml"/>
         </fileset>
       </copy>
  
  
  
  1.1                  avalon-logkit/LICENSE.txt
  
  Index: LICENSE.txt
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *    "This product includes software developed by the
   *    Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software
   *    itself, if and wherever such third-party acknowledgments
   *    normally appear.
   *
   * 4. The names "Avalon", "LogKit" and "Apache Software Foundation"
   *    must not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation. For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org