Merge

nashorn/make/project.properties

@@ -37,7 +37,8 @@ javac.target=1.9
 
 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

nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java

@@ -281,8 +281,7 @@ public final class Main extends Shell {
         }
     }
 
-    // FIXME: needs to be changed to use javase 9 docs later
+    private static String JAVADOC_BASE = "https://docs.oracle.com/javase/9/docs/api/";
-    private static String JAVADOC_BASE = "http://download.java.net/jdk9/docs/api/";
 
     private static void openBrowserForJavadoc(String relativeUrl) {
         try {

nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java

@@ -114,7 +114,11 @@ final class JavaAdapterClassLoader {
             @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

nashorn/test/TEST.ROOT

@@ -12,3 +12,6 @@ requiredVersion=4.2 b07
 
 # Use new module options
 useNewOptions=true
+
+# Use --patch-module instead of -Xmodule:
+useNewPatchModule=true