From 281beca855bea169c3175860ab951ee73012e128 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Tue, 19 Dec 2017 21:35:30 +0530 Subject: [PATCH] 8193779: Fix copyright header in nashorn builtin scripts Reviewed-by: alanb, hannesw --- .../nashorn/internal/runtime/resources/mozilla_compat.js | 4 +++- .../jdk/nashorn/internal/runtime/resources/parser.js | 4 +++- .../script/trusted/classfilter_mozilla_compat.js.EXPECTED | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js index a829e4c54f9..dadef9bbc61 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js @@ -4,7 +4,9 @@ * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js index 94d02aba67b..bd511f0e009 100644 --- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js @@ -4,7 +4,9 @@ * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or diff --git a/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED b/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED index 7491e443b91..19db7152c22 100644 --- a/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED +++ b/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED @@ -1,12 +1,12 @@ class jdk.nashorn.javaadapters.javax_script_ScriptContext -TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 39 +TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 41 class jdk.nashorn.javaadapters.java_util_ArrayList class jdk.nashorn.javaadapters.java_util_ArrayList [JavaClass java.lang.Integer] -TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 373 at column number 16 +TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 375 at column number 16 [JavaClass java.util.HashSet] [JavaClass java.util.HashSet] [JavaClass java.lang.Integer] -ReferenceError: "Integer" is not defined in nashorn:mozilla_compat.js at line number 67 +ReferenceError: "Integer" is not defined in nashorn:mozilla_compat.js at line number 69 [JavaClass java.util.HashMap] [JavaClass java.util.HashMap]