jython-checkins

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython
In directory slayer.i.sourceforge.net:/tmp/cvs-serv15435

Modified Files:
	LICENSE.txt 
Log Message:
Moved the BeOpen & CNRI licenses to Lib/LICENSE.



Index: LICENSE.txt
===================================================================
RCS file: /cvsroot/jython/jython/LICENSE.txt,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -r2.2 -r2.3
*** LICENSE.txt	2000/11/24 17:01:58	2.2
--- LICENSE.txt	2000/11/25 21:30:56	2.3
***************
*** 10,14 ****
--- 10,21 ----
  
  
+ The standard library is covered by the BeOpen / CNRI license. See the
+ Lib/LICENSE file for details.
  
+ The oro regular expresion matcher is covered by the apache license. 
+ See the org/apache/LICENSE file for details.
+ 
+ 
+ 
  Jython changes Software License.
  ================================
***************
*** 134,284 ****
                                 [ACCEPT BUTTON]
  
- 
- 
- 
- BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0
- ==============================================
- 
- BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
- -----------------------------------------------------
- 
- 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
- office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
- Individual or Organization ("Licensee") accessing and otherwise using
- this software in source or binary form and its associated
- documentation ("the Software").
- 
- 2. Subject to the terms and conditions of this BeOpen Python License
- Agreement, BeOpen hereby grants Licensee a non-exclusive,
- royalty-free, world-wide license to reproduce, analyze, test, perform
- and/or display publicly, prepare derivative works, distribute, and
- otherwise use the Software alone or in any derivative version,
- provided, however, that the BeOpen Python License is retained in the
- Software, alone or in any derivative version prepared by Licensee.
- 
- 3. BeOpen is making the Software available to Licensee on an "AS IS"
- basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
- 
- 4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
- SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
- AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
- DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
- 
- 5. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
- 
- 6. This License Agreement shall be governed by and interpreted in all
- respects by the law of the State of California, excluding conflict of
- law provisions.  Nothing in this License Agreement shall be deemed to
- create any relationship of agency, partnership, or joint venture
- between BeOpen and Licensee.  This License Agreement does not grant
- permission to use BeOpen trademarks or trade names in a trademark
- sense to endorse or promote products or services of Licensee, or any
- third party.  As an exception, the "BeOpen Python" logos available at
- http://www.pythonlabs.com/logos.html may be used according to the
- permissions granted on that web page.
- 
- 7. By copying, installing or otherwise using the software, Licensee
- agrees to be bound by the terms and conditions of this License
- Agreement.
- 
- 
- CNRI OPEN SOURCE LICENSE AGREEMENT
- ----------------------------------
- 
- Python 1.6 CNRI OPEN SOURCE LICENSE AGREEMENT
- 
- IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY. BY CLICKING
- ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING, INSTALLING OR
- OTHERWISE USING PYTHON 1.6 SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
- THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT.
- 
- 1. This LICENSE AGREEMENT is between the Corporation for National
- Research Initiatives, having an office at 1895 Preston White Drive,
- Reston, VA 20191 ("CNRI"), and the Individual or Organization
- ("Licensee") accessing and otherwise using Python 1.6 software in
- source or binary form and its associated documentation, as released at
- the www.python.org Internet site on September 5, 2000 ("Python 1.6").
- 
- 2. Subject to the terms and conditions of this License Agreement, CNRI
- hereby grants Licensee a nonexclusive, royalty-free, world-wide
- license to reproduce, analyze, test, perform and/or display publicly,
- prepare derivative works, distribute, and otherwise use Python 1.6
- alone or in any derivative version, provided, however, that CNRI's
- License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
- 1995-2000 Corporation for National Research Initiatives; All Rights
- Reserved" are retained in Python 1.6 alone or in any derivative
- version prepared by
- 
- Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee
- may substitute the following text (omitting the quotes): "Python 1.6
- is made available subject to the terms and conditions in CNRI's
- License Agreement. This Agreement together with Python 1.6 may be
- located on the Internet using the following unique, persistent
- identifier (known as a handle): 1895.22/1012. This Agreement may also
- be obtained from a proxy server on the Internet using the following
- URL: http://hdl.handle.net/1895.22/1012".
- 
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates Python 1.6 or any part thereof, and wants to make the
- derivative work available to others as provided herein, then Licensee
- hereby agrees to include in any such work a brief summary of the
- changes made to Python 1.6.
- 
- 4. CNRI is making Python 1.6 available to Licensee on an "AS IS"
- basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6 WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
- 
- 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
- 1.6 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
- RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6, OR
- ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
- 
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
- 
- 7. This License Agreement shall be governed by and interpreted in all
- respects by the law of the State of Virginia, excluding conflict of
- law provisions. Nothing in this License Agreement shall be deemed to
- create any relationship of agency, partnership, or joint venture
- between CNRI and Licensee. This License Agreement does not grant
- permission to use CNRI trademarks or trade name in a trademark sense
- to endorse or promote products or services of Licensee, or any third
- party.
- 
- 8. By clicking on the "ACCEPT" button where indicated, or by copying,
- installing or otherwise using Python 1.6, Licensee agrees to be bound
- by the terms and conditions of this License Agreement.
- 
- ACCEPT
- 
- 
- CWI PERMISSIONS STATEMENT AND DISCLAIMER
- ----------------------------------------
- 
- Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
- The Netherlands.  All rights reserved.
- 
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose and without fee is hereby granted,
- provided that the above copyright notice appear in all copies and that
- both that copyright notice and this permission notice appear in
- supporting documentation, and that the name of Stichting Mathematisch
- Centrum or CWI not be used in advertising or publicity pertaining to
- distribution of the software without specific, written prior
- permission.
- 
- STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
- THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
- FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- 141,142 ----