[Jython-checkins] CVS: jython LICENSE.txt,2.3,2.4

[brian z. <bz...@us...>]

Update of /cvsroot/jython/jython
In directory usw-pr-cvs1:/tmp/cvs-serv22862

Modified Files:
	LICENSE.txt 
Log Message:
added zxJDBC info

Index: LICENSE.txt
===================================================================
RCS file: /cvsroot/jython/jython/LICENSE.txt,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -d -r2.3 -r2.4
*** LICENSE.txt	2000/11/25 21:30:56	2.3
--- LICENSE.txt	2001/11/22 05:43:47	2.4
***************
*** 2,6 ****
  =======================
  
! 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.
--- 2,6 ----
  =======================
  
! 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.
***************
*** 13,20 ****
  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.
--- 13,22 ----
  Lib/LICENSE file for details.
  
! The oro regular expresion matcher is covered by the apache license.
  See the org/apache/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.
  
  Jython changes Software License.
***************
*** 24,53 ****
  All rights reserved.
  
! Redistribution and use in source and binary forms, with or without 
! modification, are permitted provided that the following conditions 
  are met:
  
!  - Redistributions of source code must retain the above copyright 
     notice, this list of conditions and the following disclaimer.
  
!  - 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.
  
!  - Neither the name of the Jython Developers nor the names of 
!    its contributors may be used to endorse or promote products 
!    derived from this software without specific prior written permission. 
  
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
! ``AS IS'' AND ANY EXPRESS 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 REGENTS OR
  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. 
  
  
--- 26,55 ----
  All rights reserved.
  
! Redistribution and use in source and binary forms, with or without
! modification, are permitted provided that the following conditions
  are met:
  
!  - Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
  
!  - 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.
  
!  - Neither the name of the Jython Developers nor the names of
!    its contributors may be used to endorse or promote products
!    derived from this software without specific prior written permission.
  
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
! ``AS IS'' AND ANY EXPRESS 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 REGENTS OR
  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.