# HG changeset patch
# User lana
# Date 1492745635 0
# Node ID e118c818dbf84d15191414c453b77c089116fdc0
# Parent  85bf1d0aeb092d02a0862fa06c2732266e7a591f# Parent  a623ab461523a486518957dbf4e3c684d92ad380
Merge

diff -r 85bf1d0aeb09 -r e118c818dbf8 make/project.properties
--- a/make/project.properties	Thu Apr 20 18:14:07 2017 +0000
+++ b/make/project.properties	Fri Apr 21 03:33:55 2017 +0000
@@ -37,7 +37,8 @@
 
 javadoc.option=\
     -tag "implSpec:a:Implementation Requirements:" \
-    -tag "implNote:a:Implementation Note:"
+    -tag "implNote:a:Implementation Note:" \
+    -tag "moduleGraph:a:Module Graph"
 
 # nashorn version information
 nashorn.version=0.1
diff -r 85bf1d0aeb09 -r e118c818dbf8 src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java
--- a/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java	Thu Apr 20 18:14:07 2017 +0000
+++ b/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java	Fri Apr 21 03:33:55 2017 +0000
@@ -281,8 +281,7 @@
         }
     }
 
-    // FIXME: needs to be changed to use javase 9 docs later
-    private static String JAVADOC_BASE = "http://download.java.net/jdk9/docs/api/";
+    private static String JAVADOC_BASE = "https://docs.oracle.com/javase/9/docs/api/";
 
     private static void openBrowserForJavadoc(String relativeUrl) {
         try {
diff -r 85bf1d0aeb09 -r e118c818dbf8 src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java	Thu Apr 20 18:14:07 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java	Fri Apr 21 03:33:55 2017 +0000
@@ -114,7 +114,11 @@
             @Override
             public Class<?> loadClass(final String name, final boolean resolve) throws ClassNotFoundException {
                 try {
-                    Context.checkPackageAccess(name);
+                    final int i = name.lastIndexOf('.');
+                    if(i != -1){
+                        final String pkgName = name.substring(0,i);
+                        Context.checkPackageAccess(pkgName);
+                    }
                     return super.loadClass(name, resolve);
                 } catch (final SecurityException se) {
                     // we may be implementing an interface or extending a class that was
diff -r 85bf1d0aeb09 -r e118c818dbf8 test/TEST.ROOT
--- a/test/TEST.ROOT	Thu Apr 20 18:14:07 2017 +0000
+++ b/test/TEST.ROOT	Fri Apr 21 03:33:55 2017 +0000
@@ -12,3 +12,6 @@
 
 # Use new module options
 useNewOptions=true
+
+# Use --patch-module instead of -Xmodule:
+useNewPatchModule=true