commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject cvs commit: jakarta-commons/beanutils LICENSE.txt
Date Sun, 05 Oct 2003 13:36:34 GMT
rdonkin     2003/10/05 06:36:34

  Modified:    beanutils LICENSE.txt
  Log:
  Corrected licenses to match jakarta-commons standard.
  
  Revision  Changes    Path
  1.4       +4 -59     jakarta-commons/beanutils/LICENSE.txt
  
  Index: LICENSE.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/beanutils/LICENSE.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LICENSE.txt	15 Jan 2003 21:59:38 -0000	1.3
  +++ LICENSE.txt	5 Oct 2003 13:36:34 -0000	1.4
  @@ -2,59 +2,4 @@
    * $Header$
    * $Revision$
    * $Date$
  - *
  - * ====================================================================
  - *
  - * 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 acknowlegement:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowlegement may appear in the software itself,
  - *    if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Commons", 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 names without prior written
  - *    permission of the Apache Group.
  - *
  - * 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/>.
  - *
  - */
  + *
 * ====================================================================
 * 
 * The Apache
Software License, Version 1.1
 *
 * Copyright (c) 2001-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 acknowledgement:  
 *       "This product includes software developed by the

 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowlegement
may appear in the software itself,
 *    if and wherever such third-party acknowlegements
normally appear.
 *
 * 4. The names "Apache", "The Jakarta Project", "Commons", 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",
*    "Apache" nor may "Apache" appear in their names 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/>.
 *
 */ 
  \ No newline at end of file
  
  
  

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


Mime
View raw message