[Jython-checkins] SF.net SVN: jython: [3105] trunk/jython/LICENSE.txt

[<cg...@us...>]

Revision: 3105
          http://svn.sourceforge.net/jython/?rev=3105&view=rev
Author:   cgroves
Date:     2007-02-12 22:27:23 -0800 (Mon, 12 Feb 2007)

Log Message:
-----------
add the PSF License v2 to the top of our stack and moved the history to the bottom of the file

Modified Paths:
--------------
    trunk/jython/LICENSE.txt

Modified: trunk/jython/LICENSE.txt
===================================================================
--- trunk/jython/LICENSE.txt	2007-02-13 04:21:49 UTC (rev 3104)
+++ trunk/jython/LICENSE.txt	2007-02-13 06:27:23 UTC (rev 3105)
@@ -1,25 +1,56 @@
-A. HISTORY OF THE SOFTWARE
-=======================
 
-JPython was created in late 1997 by Jim Hugunin. Jim was also the
-primary developer while he was at CNRI. In February 1999 Barry Warsaw
-took over as primary developer and released JPython version 1.1.
+A. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
+=======================================================
 
-In October 2000 Barry helped move the software to SourceForge
-where it was renamed to Jython.  Jython 2.0 and on are licensed under
-the Jython specific license below. 
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
 
-The standard library is covered by the Python Software Foundation
-license. See the LICENSE_CPython.txt file for details.
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Jython") in source or binary form and
+its associated documentation.
 
-The zxJDBC package was written by Brian Zimmer and originally licensed
-under the GNU Public License.  The package is now covered by the Jython
-Software License.
+2. Subject to the terms and conditions of this License Agreement, PSF
+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 Jython alone
+or in any derivative version, provided, however, that PSF's License
+Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2007
+Python Software Foundation; All Rights Reserved" are retained in
+Jython alone or in any derivative version prepared by Licensee.
 
-The command line interpreter is covered by the Apache Software
-License.  See the LICENSE_Apache.txt file for details.
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Jython 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 Jython.
+
+4. PSF is making Jython available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF JYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF JYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING JYTHON,
+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. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Jython, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
  
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
+Jython 2.0, 2.1 License
 ================================
 
 Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
@@ -142,3 +173,28 @@
 
                                [ACCEPT BUTTON]
 
+B. HISTORY OF THE SOFTWARE
+=======================================================
+
+JPython was created in late 1997 by Jim Hugunin. Jim was also the
+primary developer while he was at CNRI. In February 1999 Barry Warsaw
+took over as primary developer and released JPython version 1.1.
+
+In October 2000 Barry helped move the software to SourceForge
+where it was renamed to Jython. Jython 2.0 and 2.1 were developed
+under the Jython specific license below.
+
+From the 2.2 release on, Jython contributors have signed
+Python Software Foundation contributor agreements and releases are
+covered under the Python Software Foundation license version 2.
+
+The standard library is covered by the Python Software Foundation
+license as well. See the Lib/LICENSE file for details.
+
+The zxJDBC package was written by Brian Zimmer and originally licensed
+under the GNU Public License.  The package is now covered by the Jython
+Software License.
+
+The command line interpreter is covered by the Apache Software
+License.  See the org/apache/LICENSE file for details.
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.