< prev index next >
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java
Print this page
*** 66,81 ****
NASHORN_MODULE.addReads(scriptModule);
}
private Module createModule(final String moduleName) {
final Module structMod = context.getStructLoader().getModule();
! final ModuleDescriptor descriptor
! = new ModuleDescriptor.Builder(moduleName)
.requires(NASHORN_MODULE.getName())
.requires(structMod.getName())
! .conceals(SCRIPTS_PKG)
! .build();
final Module mod = Context.createModuleTrusted(structMod.getLayer(), descriptor, this);
loadModuleManipulator();
return mod;
}
--- 66,92 ----
NASHORN_MODULE.addReads(scriptModule);
}
private Module createModule(final String moduleName) {
final Module structMod = context.getStructLoader().getModule();
! final ModuleDescriptor.Builder builder =
! new ModuleDescriptor.Builder(moduleName)
! .requires("java.base")
! .requires("java.logging")
.requires(NASHORN_MODULE.getName())
.requires(structMod.getName())
! .conceals(SCRIPTS_PKG);
!
! if (Context.javaSqlFound) {
! builder.requires("java.sql");
! }
!
! if (Context.javaSqlRowsetFound) {
! builder.requires("java.sql.rowset");
! }
!
! final ModuleDescriptor descriptor = builder.build();
final Module mod = Context.createModuleTrusted(structMod.getLayer(), descriptor, this);
loadModuleManipulator();
return mod;
}
< prev index next >