mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

License change to NPL 1.1/GPL duo for consistency with the rest of Rhino: 

-------- Original Message --------
Subject: Re: www.mozilla.org/rhino: Changing the license for Delegator
Date: Fri, 08 Oct 2004 16:08:01 +0100
From: Matthias Radestock <matthias@sorted.org>
To: Igor Bukanov <igor@fastmail.fm>
References: <41668055.2050404@fastmail.fm> <4166830A.3010900@sorted.org> <4166AD80.6070806@fastmail.fm>

Igor Bukanov wrote:

> Thanks, I would like to change the license header from the current:
>
> /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset:
> 4 -*-
>  * The contents of this file are subject to the Mozilla Public License
>  * Version 1.1 (the "License"); you may not use this file except in
>  * compliance with the License. You may obtain a copy of the License at
>  * http://www.mozilla.org/MPL/
>  *
>  * Software distributed under the License is distributed on an "AS IS"
>  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
>  * License for the specific language governing rights and limitations
>  * under the License.
>  *
>  * The Original Code is Delegator.java, released Sep 27, 2000.
>  *
>  * The Initial Developer of the Original Code is Matthias Radestock.
>  * <matthias@sorted.org>. Portions created by Matthias Radestock are
>  * Copyright (C) 2000 Matthias Radestock. All Rights Reserved.
>  *
>  * Contributor(s):
>  *      Redfig Ltd (http://www.redfig.com)
>  *      LShift Ltd (http://www.lshift.net)
>  *
>  * Alternatively, the contents of this file may be used under the terms
>  * of the GNU Public License (the  "GPL License"), in which case the
>  * provisions of the GPL License are applicable instead of those
>  * above.  If you wish to allow use of your version of this file only
>  * under the terms of the GPL License and not to allow others to use
>  * your version of this file under the MPL, indicate your decision by
>  * deleting  the provisions above and replace  them with the notice and
>  * other provisions required by the GPL License.  If you do not delete
>  * the provisions above, a recipient may use your version of this file
>  * under either the MPL or the GPL License.
>  */
>
>
> to the following one:
>
>
> /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset:
> 4 -*-
>  *
>  * The contents of this file are subject to the Netscape Public
>  * License Version 1.1 (the "License"); you may not use this file
>  * except in compliance with the License. You may obtain a copy of
>  * the License at http://www.mozilla.org/NPL/
>  *
>  * Software distributed under the License is distributed on an "AS
>  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
>  * implied. See the License for the specific language governing
>  * rights and limitations under the License.
>  *
>  * The Original Code is Delegator.java, released Sep 27, 2000.
>  *
>  * The Initial Developer of the Original Code is Matthias Radestock.
>  * <matthias@sorted.org>. Portions created by Matthias Radestock are
>  * Copyright (C) 2000 Matthias Radestock. All Rights Reserved.
>  *
>  * Contributor(s):
>  *
>  * Matthias Radestock, Redfig Ltd (http://www.redfig.com)
>  * Matthias Radestock, LShift Ltd (http://www.lshift.net)
>  *
>  * Alternatively, the contents of this file may be used under the
>  * terms of the GNU Public License (the "GPL"), in which case the
>  * provisions of the GPL are applicable instead of those above.
>  * If you wish to allow use of your version of this file only
>  * under the terms of the GPL and not to allow others to use your
>  * version of this file under the NPL, indicate your decision by
>  * deleting the provisions above and replace them with the notice
>  * and other provisions required by the GPL.  If you do not delete
>  * the provisions above, a recipient may use your version of this
>  * file under either the NPL or the GPL.
>  */
>
>
>
> Note that the new version replaces:
>
>  * Contributor(s):
>  *      Redfig Ltd (http://www.redfig.com)
>  *      LShift Ltd (http://www.lshift.net)
>
> by the following text:
>
>  * Contributor(s):
>  *
>  * Matthias Radestock, Redfig Ltd (http://www.redfig.com)
>  * Matthias Radestock, LShift Ltd (http://www.lshift.net)
>
> since Contributors section should contain at lease the name of the
> person contributing.
>
> If it is Ok, then I need your authorisation to perform such license
> change for the following files:
>
> mozilla/js/rhino/src/org/mozilla/javascript/Delegator.java
> mozilla/js/rhino/src/org/mozilla/javascript/.java
>
> located at the CVS repository at cvs.mozilla.org:/cvsroot
>
> The license change shall apply only to the CVS HEAD version of the files.
>

Igor,

that's all fine. Go ahead and make the changes.


Matthias.
This commit is contained in:
igor%mir2.org 2004-10-08 15:20:04 +00:00
Родитель 52024b5f77
Коммит 331238d910
2 изменённых файлов: 46 добавлений и 42 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

42
js/rhino/src/org/mozilla/javascript/Delegator.java
Просмотреть файл

@ -1,13 +1,14 @@
/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* The contents of this file are subject to the Mozilla Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS"
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
* License for the specific language governing rights and limitations
* under the License.
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Delegator.java, released Sep 27, 2000.
*
@ -16,19 +17,20 @@
* Copyright (C) 2000 Matthias Radestock. All Rights Reserved.
*
* Contributor(s):
* Redfig Ltd (http://www.redfig.com)
* LShift Ltd (http://www.lshift.net)
*
* Alternatively, the contents of this file may be used under the terms
* of the GNU Public License (the "GPL License"), in which case the
* provisions of the GPL License are applicable instead of those
* above. If you wish to allow use of your version of this file only
* under the terms of the GPL License and not to allow others to use
* your version of this file under the MPL, indicate your decision by
* deleting the provisions above and replace them with the notice and
* other provisions required by the GPL License. If you do not delete
* the provisions above, a recipient may use your version of this file
* under either the MPL or the GPL License.
* Matthias Radestock, Redfig Ltd (http://www.redfig.com)
* Matthias Radestock, LShift Ltd (http://www.lshift.net)
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU Public License (the "GPL"), in which case the
* provisions of the GPL are applicable instead of those above.
* If you wish to allow use of your version of this file only
* under the terms of the GPL and not to allow others to use your
* version of this file under the NPL, indicate your decision by
* deleting the provisions above and replace them with the notice
* and other provisions required by the GPL. If you do not delete
* the provisions above, a recipient may use your version of this
* file under either the NPL or the GPL.
*/
// API class

46
js/rhino/src/org/mozilla/javascript/Synchronizer.java
Просмотреть файл

@ -1,34 +1,36 @@
/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* The contents of this file are subject to the Mozilla Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS"
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
* License for the specific language governing rights and limitations
* under the License.
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* The Original Code is Synchronizer.java code, released Sep 27, 2000.
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Initial Developer of the Original Code is Matthias Radestock
* The Original Code is Delegator.java, released Sep 27, 2000.
*
* The Initial Developer of the Original Code is Matthias Radestock.
* <matthias@sorted.org>. Portions created by Matthias Radestock are
* Copyright (C) 2000 Matthias Radestock. All Rights Reserved.
*
* Contributor(s):
* Redfig Ltd (http://www.redfig.com)
* LShift Ltd (http://www.lshift.net)
*
* Alternatively, the contents of this file may be used under the terms
* of the GNU Public License (the "GPL License"), in which case the
* provisions of the GPL License are applicable instead of those
* above. If you wish to allow use of your version of this file only
* under the terms of the GPL License and not to allow others to use
* your version of this file under the MPL, indicate your decision by
* deleting the provisions above and replace them with the notice and
* other provisions required by the GPL License. If you do not delete
* the provisions above, a recipient may use your version of this file
* under either the MPL or the GPL License.
* Matthias Radestock, Redfig Ltd (http://www.redfig.com)
* Matthias Radestock, LShift Ltd (http://www.lshift.net)
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU Public License (the "GPL"), in which case the
* provisions of the GPL are applicable instead of those above.
* If you wish to allow use of your version of this file only
* under the terms of the GPL and not to allow others to use your
* version of this file under the NPL, indicate your decision by
* deleting the provisions above and replace them with the notice
* and other provisions required by the GPL. If you do not delete
* the provisions above, a recipient may use your version of this
* file under either the NPL or the GPL.
*/
// API class