diff --git a/mozilla/js/rhino/README.html b/mozilla/js/rhino/README.html index 1790ae72b39..b90fb0b2f1f 100644 --- a/mozilla/js/rhino/README.html +++ b/mozilla/js/rhino/README.html @@ -1,6 +1,6 @@ diff --git a/mozilla/js/rhino/apiClasses.properties b/mozilla/js/rhino/apiClasses.properties index 730c36a5efe..d116ee48967 100644 --- a/mozilla/js/rhino/apiClasses.properties +++ b/mozilla/js/rhino/apiClasses.properties @@ -1,3 +1,37 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0 +# +# 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 Rhino code, released May 6, 1999. +# +# The Initial Developer of the Original Code is +# Netscape Communications Corporation. +# Portions created by the Initial Developer are Copyright (C) 1997-1999 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# the GNU General Public License Version 2 or later (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 +# MPL, indicate your decision by deleting the provisions above and replacing +# 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 MPL or the GPL. +# +# ***** END LICENSE BLOCK ***** + apiClasses=\ src/org/mozilla/javascript/Callable.java,\ src/org/mozilla/javascript/ClassCache.java,\ diff --git a/mozilla/js/rhino/build.properties b/mozilla/js/rhino/build.properties index 18c53737c4f..d1de84034d9 100644 --- a/mozilla/js/rhino/build.properties +++ b/mozilla/js/rhino/build.properties @@ -1,5 +1,5 @@ # ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# Version: MPL 1.1/GPL 2.0 # # 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 @@ -23,16 +23,14 @@ # Igor Bukanov # # Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. +# the GNU General Public License Version 2 or later (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 +# MPL, indicate your decision by deleting the provisions above and replacing +# 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 MPL or the GPL. # # ***** END LICENSE BLOCK ***** diff --git a/mozilla/js/rhino/build.xml b/mozilla/js/rhino/build.xml index 82d65bbc5c0..748c72c9435 100644 --- a/mozilla/js/rhino/build.xml +++ b/mozilla/js/rhino/build.xml @@ -1,6 +1,6 @@ + diff --git a/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/ClassDefinitionException.java b/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/ClassDefinitionException.java index 05d40451924..2197063614d 100644 --- a/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/ClassDefinitionException.java +++ b/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/ClassDefinitionException.java @@ -2,7 +2,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ // API class diff --git a/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/NotAFunctionException.java b/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/NotAFunctionException.java index 31a3cea869e..3de53a8b0f0 100644 --- a/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/NotAFunctionException.java +++ b/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/NotAFunctionException.java @@ -2,7 +2,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -26,16 +26,14 @@ * Igor Bukanov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ // API class diff --git a/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/PropertyException.java b/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/PropertyException.java index 82a8a485f63..8d786c7948d 100644 --- a/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/PropertyException.java +++ b/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/PropertyException.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Norris Boyd * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/docs/RhinoDebugger.html b/mozilla/js/rhino/docs/RhinoDebugger.html index e0a79c45631..dc8b956e397 100644 --- a/mozilla/js/rhino/docs/RhinoDebugger.html +++ b/mozilla/js/rhino/docs/RhinoDebugger.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/ScriptingJava.html b/mozilla/js/rhino/docs/ScriptingJava.html index 15d36631646..77b84f0e335 100644 --- a/mozilla/js/rhino/docs/ScriptingJava.html +++ b/mozilla/js/rhino/docs/ScriptingJava.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/api.html b/mozilla/js/rhino/docs/api.html index 3955137cab2..1c801e1531e 100644 --- a/mozilla/js/rhino/docs/api.html +++ b/mozilla/js/rhino/docs/api.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/bsf.html b/mozilla/js/rhino/docs/bsf.html index 857132e0687..71965e03d7d 100644 --- a/mozilla/js/rhino/docs/bsf.html +++ b/mozilla/js/rhino/docs/bsf.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/changes.html b/mozilla/js/rhino/docs/changes.html index ff0d2095a83..4a867c1b457 100644 --- a/mozilla/js/rhino/docs/changes.html +++ b/mozilla/js/rhino/docs/changes.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/debugger.html b/mozilla/js/rhino/docs/debugger.html index bb804412047..d3e5e7b0d18 100644 --- a/mozilla/js/rhino/docs/debugger.html +++ b/mozilla/js/rhino/docs/debugger.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/doc.html b/mozilla/js/rhino/docs/doc.html index b3cc1ed231a..a9bbc1a9ecf 100644 --- a/mozilla/js/rhino/docs/doc.html +++ b/mozilla/js/rhino/docs/doc.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/download.html b/mozilla/js/rhino/docs/download.html index 3316f1a2268..a244fb62dd0 100644 --- a/mozilla/js/rhino/docs/download.html +++ b/mozilla/js/rhino/docs/download.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/embedding-engine.html b/mozilla/js/rhino/docs/embedding-engine.html index 45fca5970b9..db4a7917e4f 100644 --- a/mozilla/js/rhino/docs/embedding-engine.html +++ b/mozilla/js/rhino/docs/embedding-engine.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/examples.html b/mozilla/js/rhino/docs/examples.html index 84ee56f023d..e5da8568068 100644 --- a/mozilla/js/rhino/docs/examples.html +++ b/mozilla/js/rhino/docs/examples.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/faq.html b/mozilla/js/rhino/docs/faq.html index 784eb7c24b0..22014f821ec 100644 --- a/mozilla/js/rhino/docs/faq.html +++ b/mozilla/js/rhino/docs/faq.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/footprint.html b/mozilla/js/rhino/docs/footprint.html index eb97c9ec147..8db83895eef 100644 --- a/mozilla/js/rhino/docs/footprint.html +++ b/mozilla/js/rhino/docs/footprint.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/help.html b/mozilla/js/rhino/docs/help.html index 6e471adc12e..dc42f6e9e39 100644 --- a/mozilla/js/rhino/docs/help.html +++ b/mozilla/js/rhino/docs/help.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/index.html b/mozilla/js/rhino/docs/index.html index 0d72cbab65a..0e4c2ffa239 100644 --- a/mozilla/js/rhino/docs/index.html +++ b/mozilla/js/rhino/docs/index.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/javaone.html b/mozilla/js/rhino/docs/javaone.html index bb5d58361c2..c987eb7de18 100644 --- a/mozilla/js/rhino/docs/javaone.html +++ b/mozilla/js/rhino/docs/javaone.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/jsc.html b/mozilla/js/rhino/docs/jsc.html index 49567c2bd64..cae16e36e33 100644 --- a/mozilla/js/rhino/docs/jsc.html +++ b/mozilla/js/rhino/docs/jsc.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/limits.html b/mozilla/js/rhino/docs/limits.html index 849c7c288d4..e74d33ef3f6 100644 --- a/mozilla/js/rhino/docs/limits.html +++ b/mozilla/js/rhino/docs/limits.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/opt.html b/mozilla/js/rhino/docs/opt.html index b072bf9a9c5..583c8cde9c7 100644 --- a/mozilla/js/rhino/docs/opt.html +++ b/mozilla/js/rhino/docs/opt.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/overview.html b/mozilla/js/rhino/docs/overview.html index 0a7d32ae5cc..792037f44ab 100644 --- a/mozilla/js/rhino/docs/overview.html +++ b/mozilla/js/rhino/docs/overview.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/owner.js b/mozilla/js/rhino/docs/owner.js index afcd7bb5fa2..5b05c2cf7f5 100644 --- a/mozilla/js/rhino/docs/owner.js +++ b/mozilla/js/rhino/docs/owner.js @@ -1,3 +1,37 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0 + * + * 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 Rhino code, released May 6, 1999. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1997-1999 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. + * + * ***** END LICENSE BLOCK ***** */ + function owner() { return email("Norris Boyd", "nboyd", "atg.com"); diff --git a/mozilla/js/rhino/docs/perf.html b/mozilla/js/rhino/docs/perf.html index 8bb0d95fa97..b385e47f4fa 100644 --- a/mozilla/js/rhino/docs/perf.html +++ b/mozilla/js/rhino/docs/perf.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/rhino15R1.html b/mozilla/js/rhino/docs/rhino15R1.html index 132295daa06..cbb76297bfc 100644 --- a/mozilla/js/rhino/docs/rhino15R1.html +++ b/mozilla/js/rhino/docs/rhino15R1.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/rhino15R2.html b/mozilla/js/rhino/docs/rhino15R2.html index 460e9288978..2e0fd69e6d5 100644 --- a/mozilla/js/rhino/docs/rhino15R2.html +++ b/mozilla/js/rhino/docs/rhino15R2.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/rhino15R3.html b/mozilla/js/rhino/docs/rhino15R3.html index 018e7f115e6..cb9152b37bd 100644 --- a/mozilla/js/rhino/docs/rhino15R3.html +++ b/mozilla/js/rhino/docs/rhino15R3.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/rhino15R4-debugger.html b/mozilla/js/rhino/docs/rhino15R4-debugger.html index 3d9468b03f1..59abdd3bea2 100644 --- a/mozilla/js/rhino/docs/rhino15R4-debugger.html +++ b/mozilla/js/rhino/docs/rhino15R4-debugger.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/rhino15R4.html b/mozilla/js/rhino/docs/rhino15R4.html index ec569df2d47..08c25b0ed74 100644 --- a/mozilla/js/rhino/docs/rhino15R4.html +++ b/mozilla/js/rhino/docs/rhino15R4.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/rhino15R41.html b/mozilla/js/rhino/docs/rhino15R41.html index 3f8d97a73f9..a0e8853abb6 100644 --- a/mozilla/js/rhino/docs/rhino15R41.html +++ b/mozilla/js/rhino/docs/rhino15R41.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/rhino15R5.html b/mozilla/js/rhino/docs/rhino15R5.html index 0e367bc2105..7c0d05e9a95 100644 --- a/mozilla/js/rhino/docs/rhino15R5.html +++ b/mozilla/js/rhino/docs/rhino15R5.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/rhino16R1.html b/mozilla/js/rhino/docs/rhino16R1.html index de5268f4234..22325a8ad22 100644 --- a/mozilla/js/rhino/docs/rhino16R1.html +++ b/mozilla/js/rhino/docs/rhino16R1.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/rhino16R2.html b/mozilla/js/rhino/docs/rhino16R2.html index 02a13002188..f24f750520f 100644 --- a/mozilla/js/rhino/docs/rhino16R2.html +++ b/mozilla/js/rhino/docs/rhino16R2.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/rhino16R3.html b/mozilla/js/rhino/docs/rhino16R3.html index 5e584c71f5c..af91f1f62cb 100755 --- a/mozilla/js/rhino/docs/rhino16R3.html +++ b/mozilla/js/rhino/docs/rhino16R3.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/runtime.html b/mozilla/js/rhino/docs/runtime.html index 891968e7538..89108aeca49 100644 --- a/mozilla/js/rhino/docs/runtime.html +++ b/mozilla/js/rhino/docs/runtime.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/scopes.html b/mozilla/js/rhino/docs/scopes.html index 712266ac7b0..a71257afa5f 100644 --- a/mozilla/js/rhino/docs/scopes.html +++ b/mozilla/js/rhino/docs/scopes.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/scriptjava.html b/mozilla/js/rhino/docs/scriptjava.html index 971c17d5ffe..ebf33f06538 100644 --- a/mozilla/js/rhino/docs/scriptjava.html +++ b/mozilla/js/rhino/docs/scriptjava.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/serialization.html b/mozilla/js/rhino/docs/serialization.html index 5946df40c4d..40ee9745381 100644 --- a/mozilla/js/rhino/docs/serialization.html +++ b/mozilla/js/rhino/docs/serialization.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/shell.html b/mozilla/js/rhino/docs/shell.html index d83f0cc4dbd..a2cf607bb9f 100644 --- a/mozilla/js/rhino/docs/shell.html +++ b/mozilla/js/rhino/docs/shell.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/docs/tutorial.html b/mozilla/js/rhino/docs/tutorial.html index 8324c2afbf3..73fffa7f176 100644 --- a/mozilla/js/rhino/docs/tutorial.html +++ b/mozilla/js/rhino/docs/tutorial.html @@ -1,3 +1,37 @@ + + diff --git a/mozilla/js/rhino/examples/Control.java b/mozilla/js/rhino/examples/Control.java index ae76095b1b9..d6711818a43 100644 --- a/mozilla/js/rhino/examples/Control.java +++ b/mozilla/js/rhino/examples/Control.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -24,16 +24,14 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/Counter.java b/mozilla/js/rhino/examples/Counter.java index d520188e6fc..14c179a2cd7 100644 --- a/mozilla/js/rhino/examples/Counter.java +++ b/mozilla/js/rhino/examples/Counter.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Norris Boyd * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/CounterTest.java b/mozilla/js/rhino/examples/CounterTest.java index dd4dd519fc6..63dc74b4809 100644 --- a/mozilla/js/rhino/examples/CounterTest.java +++ b/mozilla/js/rhino/examples/CounterTest.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Norris Boyd * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/DynamicScopes.java b/mozilla/js/rhino/examples/DynamicScopes.java index 0d45fa13cf6..22b9a3a43a9 100644 --- a/mozilla/js/rhino/examples/DynamicScopes.java +++ b/mozilla/js/rhino/examples/DynamicScopes.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Norris Boyd * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/E4X/e4x_example.js b/mozilla/js/rhino/examples/E4X/e4x_example.js index 3d072f7531d..74174041943 100644 --- a/mozilla/js/rhino/examples/E4X/e4x_example.js +++ b/mozilla/js/rhino/examples/E4X/e4x_example.js @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * John Schneider * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/File.java b/mozilla/js/rhino/examples/File.java index 3dbf177d131..54dc9f01ed1 100644 --- a/mozilla/js/rhino/examples/File.java +++ b/mozilla/js/rhino/examples/File.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Norris Boyd * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/Foo.java b/mozilla/js/rhino/examples/Foo.java index c7506be9a23..ce25d5c3884 100644 --- a/mozilla/js/rhino/examples/Foo.java +++ b/mozilla/js/rhino/examples/Foo.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -24,16 +24,14 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/Matrix.java b/mozilla/js/rhino/examples/Matrix.java index 30de6ef8bcd..87e4b8afa99 100644 --- a/mozilla/js/rhino/examples/Matrix.java +++ b/mozilla/js/rhino/examples/Matrix.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -24,16 +24,14 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/NervousText.html b/mozilla/js/rhino/examples/NervousText.html index 01450500bab..0e3c7dd80dd 100644 --- a/mozilla/js/rhino/examples/NervousText.html +++ b/mozilla/js/rhino/examples/NervousText.html @@ -1,3 +1,37 @@ + + This is the NervousText applet in javascript: diff --git a/mozilla/js/rhino/examples/NervousText.js b/mozilla/js/rhino/examples/NervousText.js index 837b1b3eb9e..a2f82fece65 100644 --- a/mozilla/js/rhino/examples/NervousText.js +++ b/mozilla/js/rhino/examples/NervousText.js @@ -1,3 +1,37 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0 + * + * 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 Rhino code, released May 6, 1999. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1997-1999 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. + * + * ***** END LICENSE BLOCK ***** */ + // The Java "NervousText" example ported to JavaScript. // Compile using java org.mozilla.javascript.tools.jsc.Main -extends java.applet.Applet -implements java.lang.Runnable NervousText.js /* diff --git a/mozilla/js/rhino/examples/PrimitiveWrapFactory.java b/mozilla/js/rhino/examples/PrimitiveWrapFactory.java index 049ecbc45f7..4157a11a830 100644 --- a/mozilla/js/rhino/examples/PrimitiveWrapFactory.java +++ b/mozilla/js/rhino/examples/PrimitiveWrapFactory.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Norris Boyd * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/RunScript.java b/mozilla/js/rhino/examples/RunScript.java index 03310cfeb17..4b21eaa91c8 100644 --- a/mozilla/js/rhino/examples/RunScript.java +++ b/mozilla/js/rhino/examples/RunScript.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -24,16 +24,14 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/RunScript2.java b/mozilla/js/rhino/examples/RunScript2.java index 0c55e43bb4d..630f11075da 100644 --- a/mozilla/js/rhino/examples/RunScript2.java +++ b/mozilla/js/rhino/examples/RunScript2.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -24,16 +24,14 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/RunScript3.java b/mozilla/js/rhino/examples/RunScript3.java index c65e85e4819..7baeba8a53f 100644 --- a/mozilla/js/rhino/examples/RunScript3.java +++ b/mozilla/js/rhino/examples/RunScript3.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -24,16 +24,14 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/RunScript4.java b/mozilla/js/rhino/examples/RunScript4.java index 98537d14596..670862fb2dd 100644 --- a/mozilla/js/rhino/examples/RunScript4.java +++ b/mozilla/js/rhino/examples/RunScript4.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -24,16 +24,14 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/Shell.java b/mozilla/js/rhino/examples/Shell.java index dc58ebbcd44..786f5213214 100644 --- a/mozilla/js/rhino/examples/Shell.java +++ b/mozilla/js/rhino/examples/Shell.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -24,16 +24,14 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/SwingApplication.js b/mozilla/js/rhino/examples/SwingApplication.js index bdb657f6136..a527aadd7af 100644 --- a/mozilla/js/rhino/examples/SwingApplication.js +++ b/mozilla/js/rhino/examples/SwingApplication.js @@ -1,3 +1,37 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0 + * + * 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 Rhino code, released May 6, 1999. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1997-1999 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. + * + * ***** END LICENSE BLOCK ***** */ + /* * SwingApplication.js - a translation into JavaScript of * SwingApplication.java, a java.sun.com Swing example. diff --git a/mozilla/js/rhino/examples/checkParam.js b/mozilla/js/rhino/examples/checkParam.js index 6eb6e5f079f..51910d57218 100644 --- a/mozilla/js/rhino/examples/checkParam.js +++ b/mozilla/js/rhino/examples/checkParam.js @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Norris Boyd * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/enum.js b/mozilla/js/rhino/examples/enum.js index a00e560c66e..02034bc7494 100644 --- a/mozilla/js/rhino/examples/enum.js +++ b/mozilla/js/rhino/examples/enum.js @@ -1,7 +1,7 @@ /* -*- tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Patrick Beard * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/jsdoc.js b/mozilla/js/rhino/examples/jsdoc.js index 1dd7f6790ea..3d44e48a62e 100644 --- a/mozilla/js/rhino/examples/jsdoc.js +++ b/mozilla/js/rhino/examples/jsdoc.js @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -26,16 +26,14 @@ * Roland Pennings * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/liveConnect.js b/mozilla/js/rhino/examples/liveConnect.js index 12f8e89af71..7befc0851ff 100644 --- a/mozilla/js/rhino/examples/liveConnect.js +++ b/mozilla/js/rhino/examples/liveConnect.js @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Norris Boyd * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/examples/unique.js b/mozilla/js/rhino/examples/unique.js index f26d254194d..a4274bbc88b 100644 --- a/mozilla/js/rhino/examples/unique.js +++ b/mozilla/js/rhino/examples/unique.js @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Norris Boyd * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/src/build.xml b/mozilla/js/rhino/src/build.xml index 8f48a2e5c2e..9230b4927ea 100644 --- a/mozilla/js/rhino/src/build.xml +++ b/mozilla/js/rhino/src/build.xml @@ -1,6 +1,6 @@ diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/test.js b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/test.js index cd7f623ac6c..5f36bf75663 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/test.js +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/test.js @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Igor Bukanov, igor@fastmail.fm * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/CodePrinter.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/CodePrinter.java index 5567a9257c9..dd4f689a479 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/CodePrinter.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/CodePrinter.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 4; indent-tabs-mode: 1; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Igor Bukanov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ package org.mozilla.javascript.tools.idswitch; diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/FileBody.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/FileBody.java index cb6fc16c627..60bdfb43a53 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/FileBody.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/FileBody.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 4; indent-tabs-mode: 1; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Igor Bukanov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ package org.mozilla.javascript.tools.idswitch; diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/IdValuePair.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/IdValuePair.java index a58851fce22..69d5065e76f 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/IdValuePair.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/IdValuePair.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 4; indent-tabs-mode: 1; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Igor Bukanov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ package org.mozilla.javascript.tools.idswitch; diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/Main.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/Main.java index f46058a1393..a045346a536 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/Main.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/Main.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 4; indent-tabs-mode: 1; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Igor Bukanov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ package org.mozilla.javascript.tools.idswitch; diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/README b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/README index 321647bf41e..3c34eea543c 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/README +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/README @@ -1,3 +1,37 @@ + ***** BEGIN LICENSE BLOCK ***** + Version: MPL 1.1/GPL 2.0 + + 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 Rhino code, released May 6, 1999. + + The Initial Developer of the Original Code is + Netscape Communications Corporation. + Portions created by the Initial Developer are Copyright (C) 1997-1999 + the Initial Developer. All Rights Reserved. + + Contributor(s): + + Alternatively, the contents of this file may be used under the terms of + the GNU General Public License Version 2 or later (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 + MPL, indicate your decision by deleting the provisions above and replacing + 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 MPL or the GPL. + + ***** END LICENSE BLOCK ***** + USING IDSWITCH GENERATOR TOOL diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/SwitchGenerator.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/SwitchGenerator.java index 673409925a5..7da345cd3ed 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/SwitchGenerator.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/idswitch/SwitchGenerator.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 4; indent-tabs-mode: 1; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Igor Bukanov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ package org.mozilla.javascript.tools.idswitch; diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/jsc/Main.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/jsc/Main.java index a2d02f050cf..be3ad44f06c 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/jsc/Main.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/jsc/Main.java @@ -1,5 +1,5 @@ /* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Roger Lawrence * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties index f30ddc5174e..dd7cd6f386b 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/resources/Messages.properties @@ -2,7 +2,7 @@ # JavaScript tools messages file. # # ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# Version: MPL 1.1/GPL 2.0 # # 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 @@ -25,16 +25,14 @@ # Contributor(s): # # Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. +# the GNU General Public License Version 2 or later (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 +# MPL, indicate your decision by deleting the provisions above and replacing +# 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 MPL or the GPL. # # ***** END LICENSE BLOCK ***** diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/ConsoleTextArea.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/ConsoleTextArea.java index bc90b5d439e..fcc38c6be27 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/ConsoleTextArea.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/ConsoleTextArea.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Christopher Oliver * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ package org.mozilla.javascript.tools.shell; diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Environment.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Environment.java index f336952a89f..19904b925e2 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Environment.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Environment.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -24,16 +24,14 @@ * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Global.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Global.java index 5752d6e4561..aed6e1306d5 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Global.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Global.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -30,16 +30,14 @@ * Matthias Radestock * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/JSConsole.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/JSConsole.java index 054ee5bc7cf..8254a097ab1 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/JSConsole.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/JSConsole.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Christopher Oliver * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ package org.mozilla.javascript.tools.shell; diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java index e91946ea177..e598995b655 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Igor Bukanov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Main.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Main.java index 56b27d4b4bd..1b97bfd4d5c 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Main.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/Main.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -29,16 +29,14 @@ * Kurt Westerfeld * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/QuitAction.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/QuitAction.java index 78a96de0033..dcad90ea378 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/QuitAction.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/QuitAction.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Igor Bukanov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/SecurityProxy.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/SecurityProxy.java index ee22a9c95ea..8f029eae206 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/SecurityProxy.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/SecurityProxy.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Igor Bukanov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/ShellContextFactory.java b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/ShellContextFactory.java index 6727329f46d..569f4bf1165 100644 --- a/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/ShellContextFactory.java +++ b/mozilla/js/rhino/toolsrc/org/mozilla/javascript/tools/shell/ShellContextFactory.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Igor Bukanov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/xmlimplsrc/build.xml b/mozilla/js/rhino/xmlimplsrc/build.xml index 5c977418f5c..a697b0f2d34 100644 --- a/mozilla/js/rhino/xmlimplsrc/build.xml +++ b/mozilla/js/rhino/xmlimplsrc/build.xml @@ -1,6 +1,6 @@ diff --git a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/LogicalEquality.java b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/LogicalEquality.java index 6412c3cc241..9560339d7f4 100644 --- a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/LogicalEquality.java +++ b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/LogicalEquality.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Ethan Hugg * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java index 6728fd8a859..263435aca74 100644 --- a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java +++ b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -27,16 +27,14 @@ * Milen Nankov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/NamespaceHelper.java b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/NamespaceHelper.java index 248a123b3b9..900a13a887b 100644 --- a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/NamespaceHelper.java +++ b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/NamespaceHelper.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Milen Nankov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java index b6207907b9c..3b157448d51 100644 --- a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java +++ b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -27,16 +27,14 @@ * Milen Nankov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XML.java b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XML.java index 22ebb2925da..173a00648b9 100644 --- a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XML.java +++ b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XML.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -27,16 +27,14 @@ * Milen Nankov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLCtor.java b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLCtor.java index 84000142529..86a59a38bb6 100644 --- a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLCtor.java +++ b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLCtor.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Igor Bukanov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java index 8d8280abd55..1e5afb8188e 100644 --- a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java +++ b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLLibImpl.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -25,16 +25,14 @@ * Igor Bukanov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java index b6d50a4a98a..81a4345a989 100644 --- a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java +++ b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLList.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -27,16 +27,14 @@ * Milen Nankov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java index 741006c934a..719a733d8c2 100644 --- a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java +++ b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLName.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -26,16 +26,14 @@ * Milen Nankov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java index dcfc568d3d6..a6146a1948c 100644 --- a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java +++ b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -28,16 +28,14 @@ * Milen Nankov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLWithScope.java b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLWithScope.java index abbf3b0bc77..5f5cee60bde 100644 --- a/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLWithScope.java +++ b/mozilla/js/rhino/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLWithScope.java @@ -1,7 +1,7 @@ /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- * * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0 * * 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 @@ -28,16 +28,14 @@ * Milen Nankov * * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. + * the GNU General Public License Version 2 or later (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 + * MPL, indicate your decision by deleting the provisions above and replacing + * 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 MPL or the GPL. * * ***** END LICENSE BLOCK ***** */