1.1 --- a/o.jython.distro/build.xml Fri Sep 11 14:35:00 2015 +0200
1.2 +++ b/o.jython.distro/build.xml Sat Sep 12 23:03:15 2015 -0700
1.3 @@ -24,7 +24,7 @@
1.4 <target name="release" depends="init">
1.5 <property name="jython_dir" location="${cluster}/jython-${jython_src_version}"/>
1.6
1.7 - <unzip dest="${cluster}" src="external/jython-2.7.0-rc3.zip"/>
1.8 + <unzip dest="${cluster}" src="external/jython-2.7.0.zip"/>
1.9
1.10 <chmod perm="ugo+x">
1.11 <fileset dir="${jython_dir}/">
2.1 --- a/o.jython.distro/external/binaries-list Fri Sep 11 14:35:00 2015 +0200
2.2 +++ b/o.jython.distro/external/binaries-list Sat Sep 12 23:03:15 2015 -0700
2.3 @@ -1,1 +1,1 @@
2.4 -DA149FA5AF1D3CAA2648F122EEF10EE49807D0C0 jython-2.7.0-rc3.zip
2.5 +0D5C9759AEE220ED2AADD30D1F01817A0E9F4989 jython-2.7.0.zip
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/o.jython.distro/external/jython-2.7.0-license.txt Sat Sep 12 23:03:15 2015 -0700
3.3 @@ -0,0 +1,208 @@
3.4 +Name: Jython
3.5 +Version: 2.7.0
3.6 +Description: The Java-based implementation of Python
3.7 +License: Jython
3.8 +OSR: 9913
3.9 +Origin: http://www.jython.org
3.10 +Source: http://www.jython.org
3.11 +
3.12 +Use of Jython version 2.7.0 is governed by the terms of the license below:
3.13 +
3.14 +A. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
3.15 +=======================================================
3.16 +
3.17 +PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
3.18 +--------------------------------------------
3.19 +
3.20 +1. This LICENSE AGREEMENT is between the Python Software Foundation
3.21 +("PSF"), and the Individual or Organization ("Licensee") accessing and
3.22 +otherwise using this software ("Jython") in source or binary form and
3.23 +its associated documentation.
3.24 +
3.25 +2. Subject to the terms and conditions of this License Agreement, PSF
3.26 +hereby grants Licensee a nonexclusive, royalty-free, world-wide
3.27 +license to reproduce, analyze, test, perform and/or display publicly,
3.28 +prepare derivative works, distribute, and otherwise use Jython alone
3.29 +or in any derivative version, provided, however, that PSF's License
3.30 +Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2007
3.31 +Python Software Foundation; All Rights Reserved" are retained in
3.32 +Jython alone or in any derivative version prepared by Licensee.
3.33 +
3.34 +3. In the event Licensee prepares a derivative work that is based on
3.35 +or incorporates Jython or any part thereof, and wants to make
3.36 +the derivative work available to others as provided herein, then
3.37 +Licensee hereby agrees to include in any such work a brief summary of
3.38 +the changes made to Jython.
3.39 +
3.40 +4. PSF is making Jython available to Licensee on an "AS IS"
3.41 +basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
3.42 +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
3.43 +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
3.44 +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF JYTHON WILL NOT
3.45 +INFRINGE ANY THIRD PARTY RIGHTS.
3.46 +
3.47 +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF JYTHON
3.48 +FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
3.49 +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING JYTHON,
3.50 +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
3.51 +
3.52 +6. This License Agreement will automatically terminate upon a material
3.53 +breach of its terms and conditions.
3.54 +
3.55 +7. Nothing in this License Agreement shall be deemed to create any
3.56 +relationship of agency, partnership, or joint venture between PSF and
3.57 +Licensee. This License Agreement does not grant permission to use PSF
3.58 +trademarks or trade name in a trademark sense to endorse or promote
3.59 +products or services of Licensee, or any third party.
3.60 +
3.61 +8. By copying, installing or otherwise using Jython, Licensee
3.62 +agrees to be bound by the terms and conditions of this License
3.63 +Agreement.
3.64 +
3.65 +Jython 2.0, 2.1 License
3.66 +================================
3.67 +
3.68 +Copyright (c) 2000-2009 Jython Developers.
3.69 +All rights reserved.
3.70 +
3.71 +Redistribution and use in source and binary forms, with or without
3.72 +modification, are permitted provided that the following conditions
3.73 +are met:
3.74 +
3.75 + - Redistributions of source code must retain the above copyright
3.76 + notice, this list of conditions and the following disclaimer.
3.77 +
3.78 + - Redistributions in binary form must reproduce the above copyright
3.79 + notice, this list of conditions and the following disclaimer in
3.80 + the documentation and/or other materials provided with the distribution.
3.81 +
3.82 + - Neither the name of the Jython Developers nor the names of
3.83 + its contributors may be used to endorse or promote products
3.84 + derived from this software without specific prior written permission.
3.85 +
3.86 +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
3.87 +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
3.88 +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
3.89 +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
3.90 +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
3.91 +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
3.92 +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
3.93 +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
3.94 +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
3.95 +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
3.96 +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3.97 +
3.98 +
3.99 +
3.100 +
3.101 +JPython 1.1.x Software License.
3.102 +=========================
3.103 +
3.104 +______________________________________________________________________
3.105 +
3.106 +IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
3.107 +
3.108 +BY CLICKING ON THE "ACCEPT" BUTTON WHERE INDICATED, OR BY INSTALLING,
3.109 +COPYING OR OTHERWISE USING THE SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
3.110 +THE TERMS AND CONDITIONS OF THIS AGREEMENT.
3.111 +
3.112 +______________________________________________________________________
3.113 +
3.114 +JPython version 1.1.x
3.115 +
3.116 + 1. This LICENSE AGREEMENT is between the Corporation for National Research
3.117 + Initiatives, having an office at 1895 Preston White Drive, Reston, VA
3.118 + 20191 ("CNRI"), and the Individual or Organization ("Licensee")
3.119 + accessing and using JPython version 1.1.x in source or binary form and
3.120 + its associated documentation as provided herein ("Software").
3.121 +
3.122 + 2. Subject to the terms and conditions of this License Agreement, CNRI
3.123 + hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
3.124 + world-wide license to reproduce, analyze, test, perform and/or display
3.125 + publicly, prepare derivative works, distribute, and otherwise use the
3.126 + Software alone or in any derivative version, provided, however, that
3.127 + CNRI's License Agreement and CNRI's notice of copyright, i.e.,
3.128 + "Copyright ©1996-1999 Corporation for National Research Initiatives;
3.129 + All Rights Reserved" are both retained in the Software, alone or in any
3.130 + derivative version prepared by Licensee.
3.131 +
3.132 + Alternatively, in lieu of CNRI's License Agreement, Licensee may
3.133 + substitute the following text (omitting the quotes), provided, however,
3.134 + that such text is displayed prominently in the Software alone or in any
3.135 + derivative version prepared by Licensee: "JPython (Version 1.1.x) is
3.136 + made available subject to the terms and conditions in CNRI's License
3.137 + Agreement. This Agreement may be located on the Internet using the
3.138 + following unique, persistent identifier (known as a handle):
3.139 + 1895.22/1006. The License may also be obtained from a proxy server on
3.140 + the Web using the following URL: http://hdl.handle.net/1895.22/1006."
3.141 +
3.142 + 3. In the event Licensee prepares a derivative work that is based on or
3.143 + incorporates the Software or any part thereof, and wants to make the
3.144 + derivative work available to the public as provided herein, then
3.145 + Licensee hereby agrees to indicate in any such work, in a prominently
3.146 + visible way, the nature of the modifications made to CNRI's Software.
3.147 +
3.148 + 4. Licensee may not use CNRI trademarks or trade name, including JPython
3.149 + or CNRI, in a trademark sense to endorse or promote products or
3.150 + services of Licensee, or any third party. Licensee may use the mark
3.151 + JPython in connection with Licensee's derivative versions that are
3.152 + based on or incorporate the Software, but only in the form
3.153 + "JPython-based ___________________," or equivalent.
3.154 +
3.155 + 5. CNRI is making the Software available to Licensee on an "AS IS" basis.
3.156 + CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
3.157 + OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
3.158 + REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
3.159 + PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
3.160 + ANY THIRD PARTY RIGHTS.
3.161 +
3.162 + 6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
3.163 + ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
3.164 + USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
3.165 + THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
3.166 + ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
3.167 + MAY NOT APPLY TO LICENSEE.
3.168 +
3.169 + 7. This License Agreement may be terminated by CNRI (i) immediately upon
3.170 + written notice from CNRI of any material breach by the Licensee, if the
3.171 + nature of the breach is such that it cannot be promptly remedied; or
3.172 + (ii) sixty (60) days following notice from CNRI to Licensee of a
3.173 + material remediable breach, if Licensee has not remedied such breach
3.174 + within that sixty-day period.
3.175 +
3.176 + 8. This License Agreement shall be governed by and interpreted in all
3.177 + respects by the law of the State of Virginia, excluding conflict of law
3.178 + provisions. Nothing in this Agreement shall be deemed to create any
3.179 + relationship of agency, partnership, or joint venture between CNRI and
3.180 + Licensee.
3.181 +
3.182 + 9. By clicking on the "ACCEPT" button where indicated, or by installing,
3.183 + copying or otherwise using the Software, Licensee agrees to be bound by
3.184 + the terms and conditions of this License Agreement.
3.185 +
3.186 + [ACCEPT BUTTON]
3.187 +
3.188 +B. HISTORY OF THE SOFTWARE
3.189 +=======================================================
3.190 +
3.191 +JPython was created in late 1997 by Jim Hugunin. Jim was also the
3.192 +primary developer while he was at CNRI. In February 1999 Barry Warsaw
3.193 +took over as primary developer and released JPython version 1.1.
3.194 +
3.195 +In October 2000 Barry helped move the software to SourceForge
3.196 +where it was renamed to Jython. Jython 2.0 and 2.1 were developed
3.197 +under the Jython specific license below.
3.198 +
3.199 +From the 2.2 release on, Jython contributors have signed
3.200 +Python Software Foundation contributor agreements and releases are
3.201 +covered under the Python Software Foundation license version 2.
3.202 +
3.203 +The standard library is covered by the Python Software Foundation
3.204 +license as well. See the Lib/LICENSE file for details.
3.205 +
3.206 +The zxJDBC package was written by Brian Zimmer and originally licensed
3.207 +under the GNU Public License. The package is now covered by the Jython
3.208 +Software License.
3.209 +
3.210 +The command line interpreter is covered by the Apache Software
3.211 +License. See the org/apache/LICENSE file for details.
4.1 --- a/o.jython.distro/external/jython-2.7.0-rc3-license.txt Fri Sep 11 14:35:00 2015 +0200
4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
4.3 @@ -1,209 +0,0 @@
4.4 -Name: Jython
4.5 -Version: 2.7.0-rc3
4.6 -Description: The Java-based implementation of Python
4.7 -License: Jython
4.8 -OSR: 9913
4.9 -Origin: http://www.jython.org
4.10 -Source: http://www.jython.org
4.11 -
4.12 -Use of Jython version 2.7.0-rc3 is governed by the terms of the license below:
4.13 -
4.14 -A. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
4.15 -=======================================================
4.16 -
4.17 -PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
4.18 ---------------------------------------------
4.19 -
4.20 -1. This LICENSE AGREEMENT is between the Python Software Foundation
4.21 -("PSF"), and the Individual or Organization ("Licensee") accessing and
4.22 -otherwise using this software ("Jython") in source or binary form and
4.23 -its associated documentation.
4.24 -
4.25 -2. Subject to the terms and conditions of this License Agreement, PSF
4.26 -hereby grants Licensee a nonexclusive, royalty-free, world-wide
4.27 -license to reproduce, analyze, test, perform and/or display publicly,
4.28 -prepare derivative works, distribute, and otherwise use Jython alone
4.29 -or in any derivative version, provided, however, that PSF's License
4.30 -Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2007
4.31 -Python Software Foundation; All Rights Reserved" are retained in
4.32 -Jython alone or in any derivative version prepared by Licensee.
4.33 -
4.34 -3. In the event Licensee prepares a derivative work that is based on
4.35 -or incorporates Jython or any part thereof, and wants to make
4.36 -the derivative work available to others as provided herein, then
4.37 -Licensee hereby agrees to include in any such work a brief summary of
4.38 -the changes made to Jython.
4.39 -
4.40 -4. PSF is making Jython available to Licensee on an "AS IS"
4.41 -basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
4.42 -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
4.43 -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
4.44 -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF JYTHON WILL NOT
4.45 -INFRINGE ANY THIRD PARTY RIGHTS.
4.46 -
4.47 -5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF JYTHON
4.48 -FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
4.49 -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING JYTHON,
4.50 -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
4.51 -
4.52 -6. This License Agreement will automatically terminate upon a material
4.53 -breach of its terms and conditions.
4.54 -
4.55 -7. Nothing in this License Agreement shall be deemed to create any
4.56 -relationship of agency, partnership, or joint venture between PSF and
4.57 -Licensee. This License Agreement does not grant permission to use PSF
4.58 -trademarks or trade name in a trademark sense to endorse or promote
4.59 -products or services of Licensee, or any third party.
4.60 -
4.61 -8. By copying, installing or otherwise using Jython, Licensee
4.62 -agrees to be bound by the terms and conditions of this License
4.63 -Agreement.
4.64 -
4.65 -Jython 2.0, 2.1 License
4.66 -================================
4.67 -
4.68 -Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
4.69 -All rights reserved.
4.70 -
4.71 -Redistribution and use in source and binary forms, with or without
4.72 -modification, are permitted provided that the following conditions
4.73 -are met:
4.74 -
4.75 - - Redistributions of source code must retain the above copyright
4.76 - notice, this list of conditions and the following disclaimer.
4.77 -
4.78 - - Redistributions in binary form must reproduce the above copyright
4.79 - notice, this list of conditions and the following disclaimer in
4.80 - the documentation and/or other materials provided with the distribution.
4.81 -
4.82 - - Neither the name of the Jython Developers nor the names of
4.83 - its contributors may be used to endorse or promote products
4.84 - derived from this software without specific prior written permission.
4.85 -
4.86 -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
4.87 -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
4.88 -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
4.89 -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
4.90 -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
4.91 -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
4.92 -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
4.93 -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
4.94 -OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
4.95 -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
4.96 -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4.97 -
4.98 -
4.99 -
4.100 -
4.101 -JPython 1.1.x Software License.
4.102 -=========================
4.103 -
4.104 -______________________________________________________________________
4.105 -
4.106 -IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
4.107 -
4.108 -BY CLICKING ON THE "ACCEPT" BUTTON WHERE INDICATED, OR BY INSTALLING,
4.109 -COPYING OR OTHERWISE USING THE SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
4.110 -THE TERMS AND CONDITIONS OF THIS AGREEMENT.
4.111 -
4.112 -______________________________________________________________________
4.113 -
4.114 -JPython version 1.1.x
4.115 -
4.116 - 1. This LICENSE AGREEMENT is between the Corporation for National Research
4.117 - Initiatives, having an office at 1895 Preston White Drive, Reston, VA
4.118 - 20191 ("CNRI"), and the Individual or Organization ("Licensee")
4.119 - accessing and using JPython version 1.1.x in source or binary form and
4.120 - its associated documentation as provided herein ("Software").
4.121 -
4.122 - 2. Subject to the terms and conditions of this License Agreement, CNRI
4.123 - hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
4.124 - world-wide license to reproduce, analyze, test, perform and/or display
4.125 - publicly, prepare derivative works, distribute, and otherwise use the
4.126 - Software alone or in any derivative version, provided, however, that
4.127 - CNRI's License Agreement and CNRI's notice of copyright, i.e.,
4.128 - "Copyright ©1996-1999 Corporation for National Research Initiatives;
4.129 - All Rights Reserved" are both retained in the Software, alone or in any
4.130 - derivative version prepared by Licensee.
4.131 -
4.132 - Alternatively, in lieu of CNRI's License Agreement, Licensee may
4.133 - substitute the following text (omitting the quotes), provided, however,
4.134 - that such text is displayed prominently in the Software alone or in any
4.135 - derivative version prepared by Licensee: "JPython (Version 1.1.x) is
4.136 - made available subject to the terms and conditions in CNRI's License
4.137 - Agreement. This Agreement may be located on the Internet using the
4.138 - following unique, persistent identifier (known as a handle):
4.139 - 1895.22/1006. The License may also be obtained from a proxy server on
4.140 - the Web using the following URL: http://hdl.handle.net/1895.22/1006."
4.141 -
4.142 - 3. In the event Licensee prepares a derivative work that is based on or
4.143 - incorporates the Software or any part thereof, and wants to make the
4.144 - derivative work available to the public as provided herein, then
4.145 - Licensee hereby agrees to indicate in any such work, in a prominently
4.146 - visible way, the nature of the modifications made to CNRI's Software.
4.147 -
4.148 - 4. Licensee may not use CNRI trademarks or trade name, including JPython
4.149 - or CNRI, in a trademark sense to endorse or promote products or
4.150 - services of Licensee, or any third party. Licensee may use the mark
4.151 - JPython in connection with Licensee's derivative versions that are
4.152 - based on or incorporate the Software, but only in the form
4.153 - "JPython-based ___________________," or equivalent.
4.154 -
4.155 - 5. CNRI is making the Software available to Licensee on an "AS IS" basis.
4.156 - CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
4.157 - OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
4.158 - REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
4.159 - PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
4.160 - ANY THIRD PARTY RIGHTS.
4.161 -
4.162 - 6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
4.163 - ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
4.164 - USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
4.165 - THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
4.166 - ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
4.167 - MAY NOT APPLY TO LICENSEE.
4.168 -
4.169 - 7. This License Agreement may be terminated by CNRI (i) immediately upon
4.170 - written notice from CNRI of any material breach by the Licensee, if the
4.171 - nature of the breach is such that it cannot be promptly remedied; or
4.172 - (ii) sixty (60) days following notice from CNRI to Licensee of a
4.173 - material remediable breach, if Licensee has not remedied such breach
4.174 - within that sixty-day period.
4.175 -
4.176 - 8. This License Agreement shall be governed by and interpreted in all
4.177 - respects by the law of the State of Virginia, excluding conflict of law
4.178 - provisions. Nothing in this Agreement shall be deemed to create any
4.179 - relationship of agency, partnership, or joint venture between CNRI and
4.180 - Licensee.
4.181 -
4.182 - 9. By clicking on the "ACCEPT" button where indicated, or by installing,
4.183 - copying or otherwise using the Software, Licensee agrees to be bound by
4.184 - the terms and conditions of this License Agreement.
4.185 -
4.186 - [ACCEPT BUTTON]
4.187 -
4.188 -B. HISTORY OF THE SOFTWARE
4.189 -=======================================================
4.190 -
4.191 -JPython was created in late 1997 by Jim Hugunin. Jim was also the
4.192 -primary developer while he was at CNRI. In February 1999 Barry Warsaw
4.193 -took over as primary developer and released JPython version 1.1.
4.194 -
4.195 -In October 2000 Barry helped move the software to SourceForge
4.196 -where it was renamed to Jython. Jython 2.0 and 2.1 were developed
4.197 -under the Jython specific license below.
4.198 -
4.199 -From the 2.2 release on, Jython contributors have signed
4.200 -Python Software Foundation contributor agreements and releases are
4.201 -covered under the Python Software Foundation license version 2.
4.202 -
4.203 -The standard library is covered by the Python Software Foundation
4.204 -license as well. See the Lib/LICENSE file for details.
4.205 -
4.206 -The zxJDBC package was written by Brian Zimmer and originally licensed
4.207 -under the GNU Public License. The package is now covered by the Jython
4.208 -Software License.
4.209 -
4.210 -The command line interpreter is covered by the Apache Software
4.211 -License. See the org/apache/LICENSE file for details.
4.212 -
5.1 --- a/o.jython.distro/external/update_jython.sh Fri Sep 11 14:35:00 2015 +0200
5.2 +++ b/o.jython.distro/external/update_jython.sh Sat Sep 12 23:03:15 2015 -0700
5.3 @@ -1,11 +1,12 @@
5.4 #!/bin/sh
5.5
5.6 +version=2.7.0
5.7 repository=https://bitbucket.org/jython/jython
5.8 -target=jython-2.7.0-rc3.zip
5.9 -dist=jython-2.7.0-rc3
5.10 +target=jython-${version}.zip
5.11 +dist=jython-${version}
5.12 location=jython
5.13
5.14 -hg clone --rev v2.7rc3 $repository $location
5.15 +hg clone --rev v${version} $repository $location
5.16 cd $location
5.17
5.18 # Note - need both ant calls
6.1 --- a/o.jython.distro/nbproject/project.properties Fri Sep 11 14:35:00 2015 +0200
6.2 +++ b/o.jython.distro/nbproject/project.properties Sat Sep 12 23:03:15 2015 -0700
6.3 @@ -1,5 +1,5 @@
6.4 # NOTE: Keep in sync with o.jython/nbproject/project.properties
6.5 # TODO This dependency should be easy to automate with a <property file=...>
6.6 -jython_src_version=2.7.0-rc3
6.7 +jython_src_version=2.7.0
6.8
6.9 jython_build=build
7.1 --- a/o.jython.distro/src/org/jython/distro/Bundle.properties Fri Sep 11 14:35:00 2015 +0200
7.2 +++ b/o.jython.distro/src/org/jython/distro/Bundle.properties Sat Sep 12 23:03:15 2015 -0700
7.3 @@ -2,5 +2,5 @@
7.4 OpenIDE-Module-Name=Jython Distribution
7.5 OpenIDE-Module-Short-Description=Bundled distribution of Jython
7.6 OpenIDE-Module-Long-Description=\
7.7 - Bundled distribution of Jython 2.5.1
7.8 + Bundled distribution of Jython 2.7
7.9
8.1 --- a/o.jython/nbproject/project.properties Fri Sep 11 14:35:00 2015 +0200
8.2 +++ b/o.jython/nbproject/project.properties Sat Sep 12 23:03:15 2015 -0700
8.3 @@ -4,7 +4,7 @@
8.4 # NOTE: Also keep in sync with o.jython.distro/nbproject/project.properties
8.5 # TODO The second dependency should be easy to automate with a <property file=...>
8.6 #
8.7 -jython_src_version=2.7.0-rc3
8.8 +jython_src_version=2.7.0
8.9
8.10 is.autoload=true
8.11 extra.module.files=modules/ext/jython-parser.jar
9.1 --- a/python.core/src/org/netbeans/modules/python/api/PythonOptions.java Fri Sep 11 14:35:00 2015 +0200
9.2 +++ b/python.core/src/org/netbeans/modules/python/api/PythonOptions.java Sat Sep 12 23:03:15 2015 -0700
9.3 @@ -60,7 +60,7 @@
9.4 while (!found && token.hasMoreTokens() ){
9.5 String tempToken = token.nextToken();
9.6 if(tempToken.contains(pattern) || tempToken.contains(pattern.toLowerCase()) ){
9.7 - defaultPython = tempToken + File.separator + "jython-2.7.0-rc3" // XXX: Hardcoded?
9.8 + defaultPython = tempToken + File.separator + "jython-2.7.0" // XXX: Hardcoded?
9.9 + File.separator + "bin" + File.separator + "jython";
9.10 if (System.getProperty("os.name").toLowerCase().contains("windows")){
9.11 defaultPython += ".bat";
10.1 --- a/python.core/src/org/netbeans/modules/python/api/PythonPlatformManager.java Fri Sep 11 14:35:00 2015 +0200
10.2 +++ b/python.core/src/org/netbeans/modules/python/api/PythonPlatformManager.java Sat Sep 12 23:03:15 2015 -0700
10.3 @@ -67,7 +67,7 @@
10.4
10.5 //TODO: 1. Do not hard-code platforms versions.
10.6 // 2. Shouldn't Platform Manager go into python.platform?
10.7 - File jythonInstall = InstalledFileLocator.getDefault().locate("jython-2.7.0-rc3", "org.jython", false); // NOI18N
10.8 + File jythonInstall = InstalledFileLocator.getDefault().locate("jython-2.7.0", "org.jython", false); // NOI18N
10.9 if (!jythonInstall.exists()) {
10.10 return null;
10.11 }
10.12 @@ -87,7 +87,7 @@
10.13 // % cd o.jython && ant
10.14 // % ./release/jython-2.5.1/bin/jython ../python.core/release/platform_info.py
10.15 // and then updating properties below
10.16 - platform.setName("Jython 2.7.0-rc3"); // NOI18N
10.17 + platform.setName("Jython 2.7.0"); // NOI18N
10.18 String jythonInstallDir = jythonInstall.getPath();
10.19 platform.addPythonPath(new String[] { jythonInstallDir + File.separator + "Lib",
10.20 jythonInstallDir + File.separator + "Lib" + File.separator + "site-packages" });