stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8177530: Module system implementation refresh (4/2017)

Browse Source 
Reviewed-by: mchung
This commit is contained in:
Alan Bateman 2017-04-07 08:08:42 +00:00
parent cc56ee78f2
commit 0803dc262b
11 changed files with 7 additions and 18 deletions
nashorn
src
jdk.dynalink/share/classes/jdk/dynalink
beans
CallerSensitiveDynamicMethod.javaCheckRestrictedPackage.java
linker/support
Lookup.java
jdk.scripting.nashorn/share/classes/jdk/nashorn/internal
runtime
Context.javaNashornLoader.javaScriptLoader.javaStructureLoader.java
linker
JavaAdapterClassLoader.java
scripts
ModuleGraphManipulator.java
test
TEST.ROOT
src/jdk/nashorn/test/models
Reflector.java

1
nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/CallerSensitiveDynamicMethod.java

@ -92,7 +92,6 @@ import java.lang.reflect.Executable;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Module;
import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.PrivilegedAction;

1
nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/CheckRestrictedPackage.java

@ -84,7 +84,6 @@
package jdk.dynalink.beans;
import java.lang.reflect.Modifier;
import java.lang.reflect.Module;
import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.PrivilegedAction;

1
nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/linker/support/Lookup.java

@ -89,7 +89,6 @@ import java.lang.invoke.MethodType;
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
import java.lang.reflect.Field;
import java.lang.reflect.Module;
import java.lang.reflect.Method;
/**

14
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java

@ -51,9 +51,7 @@ import java.lang.module.ModuleFinder;
import java.lang.module.ModuleReader;
import java.lang.module.ModuleReference;
import java.lang.reflect.Field;
import java.lang.reflect.Layer;
import java.lang.reflect.Modifier;
import java.lang.reflect.Module;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.Path;
@ -378,7 +376,7 @@ public final class Context {
static final boolean javaSqlFound, javaSqlRowsetFound;
static {
final Layer boot = Layer.boot();
final ModuleLayer boot = ModuleLayer.boot();
javaSqlFound = boot.findModule("java.sql").isPresent();
javaSqlRowsetFound = boot.findModule("java.sql.rowset").isPresent();
}
@ -1334,7 +1332,7 @@ public final class Context {
* @return the new Module
*/
static Module createModuleTrusted(final ModuleDescriptor descriptor, final ClassLoader loader) {
return createModuleTrusted(Layer.boot(), descriptor, loader);
return createModuleTrusted(ModuleLayer.boot(), descriptor, loader);
}
/**
@ -1346,7 +1344,7 @@ public final class Context {
* @param loader the class loader of the module
* @return the new Module
*/
static Module createModuleTrusted(final Layer parent, final ModuleDescriptor descriptor, final ClassLoader loader) {
static Module createModuleTrusted(final ModuleLayer parent, final ModuleDescriptor descriptor, final ClassLoader loader) {
final String mn = descriptor.name();
final ModuleReference mref = new ModuleReference(descriptor, null) {
@ -1374,8 +1372,8 @@ public final class Context {
final Configuration cf = parent.configuration()
.resolve(finder, ModuleFinder.of(), Set.of(mn));
final PrivilegedAction<Layer> pa = () -> parent.defineModules(cf, name -> loader);
final Layer layer = AccessController.doPrivileged(pa, GET_LOADER_ACC_CTXT);
final PrivilegedAction<ModuleLayer> pa = () -> parent.defineModules(cf, name -> loader);
final ModuleLayer layer = AccessController.doPrivileged(pa, GET_LOADER_ACC_CTXT);
final Module m = layer.findModule(mn).get();
assert m.getLayer() == layer;
@ -1796,7 +1794,7 @@ public final class Context {
collect(Collectors.toSet());
}
final Layer boot = Layer.boot();
final ModuleLayer boot = ModuleLayer.boot();
final Configuration conf = boot.configuration().
resolve(mf, ModuleFinder.of(), rootMods);
final String firstMod = rootMods.iterator().next();

1
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NashornLoader.java

@ -34,7 +34,6 @@ import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.lang.reflect.Module;
import java.security.AccessController;
import java.security.CodeSource;
import java.security.Permission;

1
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java

@ -27,7 +27,6 @@ package jdk.nashorn.internal.runtime;
import java.lang.module.ModuleDescriptor;
import java.lang.module.ModuleDescriptor.Modifier;
import java.lang.reflect.Module;
import java.security.CodeSource;
import java.util.Objects;
import java.util.Set;

1
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java

@ -32,7 +32,6 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_SINGLE_FI
import java.lang.module.ModuleDescriptor;
import java.lang.module.ModuleDescriptor.Modifier;
import java.lang.reflect.Module;
import java.security.ProtectionDomain;
import java.util.Set;
import jdk.nashorn.internal.codegen.ObjectClassGenerator;

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

@ -27,7 +27,6 @@ package jdk.nashorn.internal.runtime.linker;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Module;
import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.PrivilegedAction;

1
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/scripts/ModuleGraphManipulator.java

@ -25,7 +25,6 @@
package jdk.nashorn.internal.scripts;
import java.lang.reflect.Module;
import jdk.nashorn.api.scripting.JSObject;
/**

2
nashorn/test/TEST.ROOT

@ -8,7 +8,7 @@ keys=intermittent randomness
groups=TEST.groups
# Minimum jtreg version
requiredVersion=4.2 b04
requiredVersion=4.2 b07
# Use new module options
useNewOptions=true

1
nashorn/test/src/jdk/nashorn/test/models/Reflector.java

@ -29,7 +29,6 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Module;
import jdk.nashorn.internal.runtime.Context;
/**