This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 5d5bd76 Module Review javascript2.editor
5d5bd76 is described below
commit 5d5bd765b1af704ddbbb48d1996d9a5545c2d40d
Author: Svata Dedic <svatopluk.de...@oracle.com>
AuthorDate: Mon Sep 3 20:11:51 2018 +0200
Module Review javascript2.editor
Closes: #835
---
javascript2.editor/.gitignore | 3 +
javascript2.editor/build.xml | 12 ++--
javascript2.editor/external/binaries-list | 28 ++++++++--
.../javascript2.editor-jquery-1.6-license.txt | 26 +++++++++
.../external/javascript2.editor-jquery-license.txt | 36 ------------
...javascript2.editor-requirejs-2.1.14-license.txt | 28 ++++++++++
.../javascript2.editor-requirejs-license.txt | 45 ---------------
...bs-license.txt => js-corestubs-5.1-license.txt} | 51 ++++++++---------
.../external/js-domstubs-DOM3-license.txt | 46 ++++++++++++++++
.../external/js-domstubs-license.txt | 64 ----------------------
.../external/js-reststubs-3-license.txt | 48 ++++++++++++++++
.../external/js-reststubs-license.txt | 6 --
...se.txt => js.foundation-parser-1.0-license.txt} | 7 +++
javascript2.editor/licenseinfo.xml | 44 +++++++++++++++
.../javascript2/editor/formatter/ui/BlankLines.js | 18 ------
.../javascript2/editor/resources/jsontemplate.json | 20 +++++++
.../javascript2/editor/resources/jstemplate.js | 20 +++++++
.../licenses/BSD-ecmascript | 52 ++++++++----------
.../licenses/BSD-jsfoundation | 0
nbbuild/licenses/names.properties | 2 +
20 files changed, 321 insertions(+), 235 deletions(-)
diff --git a/javascript2.editor/.gitignore b/javascript2.editor/.gitignore
new file mode 100644
index 0000000..16ccc5b
--- /dev/null
+++ b/javascript2.editor/.gitignore
@@ -0,0 +1,3 @@
+test/unit/data/testfiles/completion/issue246060/req.js
+test/unit/data/testfiles/ecmascript6/parser/
+test/unit/data/testfiles/structure/issue226930.js
diff --git a/javascript2.editor/build.xml b/javascript2.editor/build.xml
index be42c26..544c7e3 100644
--- a/javascript2.editor/build.xml
+++ b/javascript2.editor/build.xml
@@ -24,20 +24,20 @@
<import file="../nbbuild/templates/projectized.xml"/>
<target name="build-init" depends="projectized.build-init">
- <unzip src="external/js.foundation-parser.zip"
dest="test/unit/data/testfiles/ecmascript6"/>
- <unzip src="external/javascript2.editor-requirejs-resources.zip"
dest="."/>
- <unzip src="external/javascript2.editor-jquery-resources.zip"
dest="."/>
+ <unzip src="external/js.foundation-parser-1.0.zip"
dest="test/unit/data/testfiles/ecmascript6"/>
+ <unzip
src="external/javascript2.editor-requirejs-2.1.14-resources.zip" dest="."/>
+ <unzip src="external/javascript2.editor-jquery-1.6-resources.zip"
dest="."/>
</target>
<!-- Generated JavaScript files for core libraries, used by code completion
etc. See the JsStubsGenerator project (in main/misc repository) for
details. -->
<target name="-bundle-corestubs">
- <copy file="external/js-corestubs.zip"
tofile="${cluster}/jsstubs/corestubs.zip"/>
+ <copy file="external/js-corestubs-5.1.zip"
tofile="${cluster}/jsstubs/corestubs.zip"/>
</target>
<target name="-bundle-reststubs">
- <copy file="external/js-reststubs.zip"
tofile="${cluster}/jsstubs/reststubs.zip"/>
+ <copy file="external/js-reststubs-3.zip"
tofile="${cluster}/jsstubs/reststubs.zip"/>
</target>
<target name="-bundle-domstubs">
- <copy file="external/js-domstubs.zip"
tofile="${cluster}/jsstubs/domstubs.zip"/>
+ <copy file="external/js-domstubs-DOM3.zip"
tofile="${cluster}/jsstubs/domstubs.zip"/>
</target>
<target name="release"
depends="projectized.release,-bundle-corestubs,-bundle-domstubs,-bundle-reststubs"/>
diff --git a/javascript2.editor/external/binaries-list
b/javascript2.editor/external/binaries-list
index 7d84ed5..9e09c57 100644
--- a/javascript2.editor/external/binaries-list
+++ b/javascript2.editor/external/binaries-list
@@ -1,6 +1,22 @@
-C8EEAB10E4539BEAF97476EBA252BD4B40377FA9 js-corestubs.zip
-2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C js-domstubs.zip
-7C0C3CFD989EE775198337C11715C1ACD6C84F41 js-reststubs.zip
-80BB535015E97A53057FB93F56EF28FA427250DA js.foundation-parser.zip
-446050AD183530299346C725433F1C4F18244A65
javascript2.editor-jquery-resources.zip
-4A38917342E32B7979DF8A01AC6C2EF2F057675D
javascript2.editor-requirejs-resources.zip
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+C8EEAB10E4539BEAF97476EBA252BD4B40377FA9 js-corestubs-5.1.zip
+2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C js-domstubs-DOM3.zip
+7C0C3CFD989EE775198337C11715C1ACD6C84F41 js-reststubs-3.zip
+80BB535015E97A53057FB93F56EF28FA427250DA js.foundation-parser-1.0.zip
+446050AD183530299346C725433F1C4F18244A65
javascript2.editor-jquery-1.6-resources.zip
+4A38917342E32B7979DF8A01AC6C2EF2F057675D
javascript2.editor-requirejs-2.1.14-resources.zip
\ No newline at end of file
diff --git
a/javascript2.editor/external/javascript2.editor-jquery-1.6-license.txt
b/javascript2.editor/external/javascript2.editor-jquery-1.6-license.txt
new file mode 100644
index 0000000..9e48d24
--- /dev/null
+++ b/javascript2.editor/external/javascript2.editor-jquery-1.6-license.txt
@@ -0,0 +1,26 @@
+Name: javascript2.editor-jquery-resources
+Version: 1.6
+Description: Testcase for issue #226930
+License: MIT-jquery
+Origin: http://jquery.com
+Files: javascript2.editor-jquery-1.6-resources.zip
+
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this
+software and associated documentation files (the "Software"), to deal in the
+Software without restriction, including without limitation the rights to use,
copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies of the
Software,
+and to permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/javascript2.editor/external/javascript2.editor-jquery-license.txt
b/javascript2.editor/external/javascript2.editor-jquery-license.txt
deleted file mode 100644
index e4e5e00..0000000
--- a/javascript2.editor/external/javascript2.editor-jquery-license.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Copyright JS Foundation and other contributors, https://js.foundation/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/jquery
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-All files located in the node_modules and external directories are
-externally maintained libraries used by this software which have their
-own licenses; we recommend you read them, as their terms may differ from
-the terms above.
diff --git
a/javascript2.editor/external/javascript2.editor-requirejs-2.1.14-license.txt
b/javascript2.editor/external/javascript2.editor-requirejs-2.1.14-license.txt
new file mode 100644
index 0000000..5b5dc36
--- /dev/null
+++
b/javascript2.editor/external/javascript2.editor-requirejs-2.1.14-license.txt
@@ -0,0 +1,28 @@
+Name: javascript2.editor-requirejs-resources
+Version: 2.1.14
+Description: Testcase for issue #246060
+License: MIT
+Origin: https://github.com/requirejs/requirejs
+Files: javascript2.editor-requirejs-2.1.14-resources.zip
+
+The MIT License
+
+Copyright (c) 2010-2014, The Dojo Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git
a/javascript2.editor/external/javascript2.editor-requirejs-license.txt
b/javascript2.editor/external/javascript2.editor-requirejs-license.txt
deleted file mode 100644
index 5769475..0000000
--- a/javascript2.editor/external/javascript2.editor-requirejs-license.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Copyright jQuery Foundation and other contributors, https://jquery.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/requirejs/requirejs
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-Copyright and related rights for sample code are waived via CC0. Sample
-code is defined as all source code displayed within the prose of the
-documentation.
-
-CC0: http://creativecommons.org/publicdomain/zero/1.0/
-
-====
-
-Files located in the node_modules directory, and certain utilities used
-to build or test the software in the test and dist directories, are
-externally maintained libraries used by this software which have their own
-licenses; we recommend you read them, as their terms may differ from the
-terms above.
diff --git a/javascript2.editor/external/js-corestubs-license.txt
b/javascript2.editor/external/js-corestubs-5.1-license.txt
similarity index 85%
copy from javascript2.editor/external/js-corestubs-license.txt
copy to javascript2.editor/external/js-corestubs-5.1-license.txt
index 96bc577..7ca5344 100644
--- a/javascript2.editor/external/js-corestubs-license.txt
+++ b/javascript2.editor/external/js-corestubs-5.1-license.txt
@@ -1,43 +1,44 @@
Name: js-corestubs
-Version: ECMAScript 5.1 Edition
+Version: 5.1
Description: Documentation for JavaScript libraries processed into JavaScript
stub libraries for use from code completion etc. This can be generated by the
javascript.generatestubs2 project in the main/misc repository.
License: BSD-ecmascript
-Source: http://ecma-international.org/ecma-262/5.1/
+Origin: http://ecma-international.org/ecma-262/5.1/
+Comment: ECMAScript 5.1 Edition
Software License
-All Software contained in this document ("Software)" is protected by
-copyright and is being made available under the "BSD License", included
-below. This Software may be subject to third party rights (rights from
-parties other than Ecma International), including patent rights, and no
-licenses under such third party rights are granted under this license even
-if the third party concerned is a member of Ecma International. SEE THE
-ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT
-http://www.ecma-international.org/memento/codeofconduct.htm FOR INFORMATION
-REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT
+All Software contained in this document ("Software)" is protected by
+copyright and is being made available under the "BSD License", included
+below. This Software may be subject to third party rights (rights from
+parties other than Ecma International), including patent rights, and no
+licenses under such third party rights are granted under this license even
+if the third party concerned is a member of Ecma International. SEE THE
+ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT
+http://www.ecma-international.org/memento/codeofconduct.htm FOR INFORMATION
+REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT
ECMA INTERNATIONAL STANDARDS*.
-Redistribution and use in source and binary forms, with or without
+Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-1. Redistributions of source code must retain the above copyright
+1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-3. Neither the name of the authors nor Ecma International may be used
+3. Neither the name of the authors nor Ecma International may be used
to endorse or promote products derived from this software without specific
prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/javascript2.editor/external/js-domstubs-DOM3-license.txt
b/javascript2.editor/external/js-domstubs-DOM3-license.txt
new file mode 100644
index 0000000..411e35e
--- /dev/null
+++ b/javascript2.editor/external/js-domstubs-DOM3-license.txt
@@ -0,0 +1,46 @@
+Name: js-domstubs
+Version: DOM3
+Description: Documentation for JavaScript libraries processed into JavaScript
stub libraries for use from code completion etc. This can be generated by the
javascript.generatestubs2 project in the main/misc repository.
+License: W3C2
+Origin: https://www.w3.org
+Source: https://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following
license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
diff --git a/javascript2.editor/external/js-domstubs-license.txt
b/javascript2.editor/external/js-domstubs-license.txt
deleted file mode 100644
index d0ac642..0000000
--- a/javascript2.editor/external/js-domstubs-license.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-Name: js-domstubs
-Version: DOM2, DOM3
-Description: Documentation for JavaScript libraries processed into JavaScript
stub libraries for use from code completion etc. This can be generated by the
javascript.generatestubs2 project in the main/misc repository.
-License: W3C (the original at http://www.w3.org/TR/#tr_DOM)
-Source: http://www.w3.org/TR/#tr_DOM
-
-W3C (R) DOCUMENT NOTICE AND LICENSE
-
-
-Copyright (C) 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, Institut National de Recherche en Informatique et en Automatique,
-Keio University). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
-
-Public documents on the W3C site are provided by the copyright holders under
-the following license. The software or Document Type Definitions (DTDs)
-associated with W3C specifications are governed by the Software Notice. By
-using and/or copying this document, or the W3C document from which this
-statement is linked, you (the licensee) agree that you have read, understood,
-and will comply with the following terms and conditions:
-Permission to use, copy, and distribute the contents of this document, or the
-W3C document from which this statement is linked, in any medium for any purpose
-and without fee or royalty is hereby granted, provided that you include the
-following on ALL copies of the document, or portions thereof, that you use:
-
- 1. A link or URL to the original W3C document.
- 2. The pre-existing copyright notice of the original author, or if it doesn't
- exist, a notice of the form: "Copyright (C) [$date-of-document] World Wide
- Web Consortium, (Massachusetts Institute of Technology, Institut National
- de Recherche en Informatique et en Automatique, Keio University). All
- Rights Reserved. http://www.w3.org/Consortium/Legal/"; (Hypertext is
- preferred, but a textual representation is permitted.)
- 3. If it exists, the STATUS of the W3C document.
-
-When space permits, inclusion of the full text of this NOTICE should be
-provided. We request that authorship attribution be provided in any software,
-documents, or other items or products that you create pursuant to the
-implementation of the contents of this document, or any portion thereof.
-No right to create modifications or derivatives of W3C documents is granted
-pursuant to this license. However, if additional requirements (documented in
-the Copyright FAQ) are satisfied, the right to create modifications or
-derivatives is sometimes granted by the W3C to individuals complying with those
-requirements.
-THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED
-TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-
-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR ANY
-PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY
-THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE
-OR IMPLEMENTATION OF THE CONTENTS THEREOF.
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to this document or its contents without specific, written
-prior permission. Title to copyright in this document will at all times remain
-with copyright holders.
-----------------------------------------------------------------------------
-This formulation of W3C's notice and license became active on April 05 1999 so
-as to account for the treatment of DTDs, schema's and bindings. See the older
-formulation for the policy prior to this date. Please see our Copyright FAQ for
-common questions about using materials from our site, including specific terms
-and conditions for packages like libwww, Amaya, and Jigsaw. Other questions
-about this notice can be directed to site-pol...@w3.org.
--------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/javascript2.editor/external/js-reststubs-3-license.txt
b/javascript2.editor/external/js-reststubs-3-license.txt
new file mode 100644
index 0000000..6a706b6
--- /dev/null
+++ b/javascript2.editor/external/js-reststubs-3-license.txt
@@ -0,0 +1,48 @@
+Name: js-reststubs
+Version: 3
+Description: Documentation for JavaScript libraries processed into JavaScript
stub libraries for use from code completion etc. This can be generated by the
javascript.generatestubs2 project in the main/misc repository.
+Origin: Oracle
+License: W3C2
+Source: https://www.w3.org
+Comment: XMLHttpRequest in unknown version, DOM stubs in version 0,2,3
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following
license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
diff --git a/javascript2.editor/external/js-reststubs-license.txt
b/javascript2.editor/external/js-reststubs-license.txt
deleted file mode 100644
index 268e33e..0000000
--- a/javascript2.editor/external/js-reststubs-license.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Name: js-reststubs
-Version: XMLHttpRequest in unknown version, DOM stubs in version 0,2,3
-Description: Documentation for JavaScript libraries processed into JavaScript
stub libraries for use from code completion etc. This can be generated by the
javascript.generatestubs2 project in the main/misc repository.
-Origin: Oracle
-License:
-Source:
diff --git a/javascript2.editor/external/js.foundation-parser-license.txt
b/javascript2.editor/external/js.foundation-parser-1.0-license.txt
similarity index 83%
copy from javascript2.editor/external/js.foundation-parser-license.txt
copy to javascript2.editor/external/js.foundation-parser-1.0-license.txt
index 7a55160..34ddb24 100644
--- a/javascript2.editor/external/js.foundation-parser-license.txt
+++ b/javascript2.editor/external/js.foundation-parser-1.0-license.txt
@@ -1,3 +1,10 @@
+Name: javascript2.editor-requirejs-resources
+Version: 1.0
+Description: Testcase for issue #246060
+License: BSD-jsfoundation
+Origin: https://js.foundation/
+Comment: the actual version/revision of the resources is unknown. Using
origin's site current license.
+
Copyright JS Foundation and other contributors, https://js.foundation/
Redistribution and use in source and binary forms, with or without
diff --git a/javascript2.editor/licenseinfo.xml
b/javascript2.editor/licenseinfo.xml
new file mode 100644
index 0000000..f271c5d
--- /dev/null
+++ b/javascript2.editor/licenseinfo.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<licenseinfo>
+ <fileset>
+ <!-- JS formatting -->
+
<file>src/org/netbeans/modules/javascript2/editor/formatter/ui/BlankLines.js</file>
+
<file>src/org/netbeans/modules/javascript2/editor/formatter/ui/Braces.js</file>
+
<file>src/org/netbeans/modules/javascript2/editor/formatter/ui/Spaces.js</file>
+
<file>src/org/netbeans/modules/javascript2/editor/formatter/ui/TabsIndents.js</file>
+
<file>src/org/netbeans/modules/javascript2/editor/formatter/ui/Wrapping.js</file>
+
+ <!-- JSON formatting -->
+
<file>src/org/netbeans/modules/javascript2/editor/formatter/ui/json/BlankLines.json</file>
+
<file>src/org/netbeans/modules/javascript2/editor/formatter/ui/json/Spaces.json</file>
+
<file>src/org/netbeans/modules/javascript2/editor/formatter/ui/json/TabsIndents.json</file>
+
<file>src/org/netbeans/modules/javascript2/editor/formatter/ui/json/Wrapping.json</file>
+
+ <!-- Coloring examples -->
+
<file>src/org/netbeans/modules/javascript2/editor/resources/JsExample</file>
+
<file>src/org/netbeans/modules/javascript2/editor/resources/JsonExample.json</file>
+
+ <license ref="Apache-2.0-ASF" />
+ <comment type="GUI_USABILITY" />
+ </fileset>
+</licenseinfo>
diff --git
a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/ui/BlankLines.js
b/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/ui/BlankLines.js
index c6ed4a3..bb515a1 100644
---
a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/ui/BlankLines.js
+++
b/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/ui/BlankLines.js
@@ -1,21 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
var engine = {
cylinders : 8,
diff --git
a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/jsontemplate.json
b/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/jsontemplate.json
index d274936..e9c081e 100644
---
a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/jsontemplate.json
+++
b/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/jsontemplate.json
@@ -1,3 +1,23 @@
+<#--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<#-- This is a FreeMarker template -->
<#-- You can change the contents of the license inserted into
# each template by opening Tools | Templates and editing
diff --git
a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/jstemplate.js
b/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/jstemplate.js
index a155883..ecc5710 100644
---
a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/jstemplate.js
+++
b/javascript2.editor/src/org/netbeans/modules/javascript2/editor/resources/jstemplate.js
@@ -1,3 +1,23 @@
+<#--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<#-- This is a FreeMarker template -->
<#-- You can change the contents of the license inserted into
# each template by opening Tools | Templates and editing
diff --git a/javascript2.editor/external/js-corestubs-license.txt
b/nbbuild/licenses/BSD-ecmascript
similarity index 75%
rename from javascript2.editor/external/js-corestubs-license.txt
rename to nbbuild/licenses/BSD-ecmascript
index 96bc577..730bba7 100644
--- a/javascript2.editor/external/js-corestubs-license.txt
+++ b/nbbuild/licenses/BSD-ecmascript
@@ -1,43 +1,37 @@
-Name: js-corestubs
-Version: ECMAScript 5.1 Edition
-Description: Documentation for JavaScript libraries processed into JavaScript
stub libraries for use from code completion etc. This can be generated by the
javascript.generatestubs2 project in the main/misc repository.
-License: BSD-ecmascript
-Source: http://ecma-international.org/ecma-262/5.1/
-
Software License
-All Software contained in this document ("Software)" is protected by
-copyright and is being made available under the "BSD License", included
-below. This Software may be subject to third party rights (rights from
-parties other than Ecma International), including patent rights, and no
-licenses under such third party rights are granted under this license even
-if the third party concerned is a member of Ecma International. SEE THE
-ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT
-http://www.ecma-international.org/memento/codeofconduct.htm FOR INFORMATION
-REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT
+All Software contained in this document ("Software)" is protected by
+copyright and is being made available under the "BSD License", included
+below. This Software may be subject to third party rights (rights from
+parties other than Ecma International), including patent rights, and no
+licenses under such third party rights are granted under this license even
+if the third party concerned is a member of Ecma International. SEE THE
+ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT
+http://www.ecma-international.org/memento/codeofconduct.htm FOR INFORMATION
+REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT
ECMA INTERNATIONAL STANDARDS*.
-Redistribution and use in source and binary forms, with or without
+Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-1. Redistributions of source code must retain the above copyright
+1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-3. Neither the name of the authors nor Ecma International may be used
+3. Neither the name of the authors nor Ecma International may be used
to endorse or promote products derived from this software without specific
prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/javascript2.editor/external/js.foundation-parser-license.txt
b/nbbuild/licenses/BSD-jsfoundation
similarity index 100%
rename from javascript2.editor/external/js.foundation-parser-license.txt
rename to nbbuild/licenses/BSD-jsfoundation
diff --git a/nbbuild/licenses/names.properties
b/nbbuild/licenses/names.properties
index f28f839..9e87cc4 100644
--- a/nbbuild/licenses/names.properties
+++ b/nbbuild/licenses/names.properties
@@ -22,12 +22,14 @@ Apache-2.0-spring3.2.7=Apache Version 2.0
(http://www.apache.org/licenses/LICEN
Apache-2.0-spring4.0.1=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Spring addendums, version
4.0.1
Apache-2.0-ASF=Apache Version 2.0 with CLA reference
(http://www.apache.org/licenses/LICENSE-2.0.txt)
OSGi=Eclipse Public License v1 (https://www.eclipse.org/legal/epl-v10.html)
with OSGi materials under Apache License Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+BSD-ecmascript=BSD license with Ecma International copyright
BSD-hamcrest=BSD license with hamcrest copyright
BSD-INRIA=BSD license with INRIA copyright
BSD-Masory=BSD license with Yuvi Masory copyright
BSD-ispell-enwl=BSD license ISpell variant
BSD-jsch=BSD-like JSch license
BSD-jsch-agentproxy=BSD-like JSch license
+BSD-jsfoundation=BSD license with JS Foundation copyright
BSD-jzlib=BSD-like zlib license
BSD-postgresql=BSD with PostgreSQL Global Development Group copyright
BSD-antlr-runtime3=BSD-like Antlr Runtime 3 license
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
