WIP: Remove jdk.jsobject module

kevinrushforth · Jun 18, 2024 · 2fd21d4 · 2fd21d4
1 parent 301bd70
commit 2fd21d4
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 318 deletions.
diff --git a/bin/unshuffle_list.txt b/bin/unshuffle_list.txt
@@ -78,7 +78,6 @@ src/jdk.jdi : jdk/src/jdk.jdi
 src/jdk.jdwp.agent : jdk/src/jdk.jdwp.agent
 src/jdk.jlink : jdk/src/jdk.jlink
 src/jdk.jshell : langtools/src/jdk.jshell
-src/jdk.jsobject : jdk/src/jdk.jsobject
 src/jdk.jstatd : jdk/src/jdk.jstatd
 src/jdk.localedata : jdk/src/jdk.localedata
 src/jdk.management : jdk/src/jdk.management

diff --git a/make/conf/docs-modules.conf b/make/conf/docs-modules.conf
@@ -51,7 +51,6 @@ DOCS_MODULES= \
     jdk.jdwp.agent \
     jdk.jfr \
     jdk.jlink \
-    jdk.jsobject \
     jdk.jshell \
     jdk.jstatd \
     jdk.localedata \

diff --git a/make/conf/module-loader-map.conf b/make/conf/module-loader-map.conf
@@ -79,7 +79,6 @@ PLATFORM_MODULES= \
     jdk.crypto.cryptoki \
     jdk.dynalink \
     jdk.httpserver \
-    jdk.jsobject \
     jdk.localedata \
     jdk.naming.dns \
     jdk.security.auth \
@@ -123,7 +122,6 @@ NATIVE_ACCESS_MODULES= \
     jdk.internal.le \
     jdk.internal.vm.ci \
     jdk.jfr \
-    jdk.jsobject \
     jdk.localedata \
     jdk.management \
     jdk.management.agent \

diff --git a/src/java.base/share/lib/security/default.policy b/src/java.base/share/lib/security/default.policy
@@ -167,10 +167,6 @@ grant codeBase "jrt:/jdk.graal.compiler" {
     permission java.security.AllPermission;
 };
 
-grant codeBase "jrt:/jdk.jsobject" {
-    permission java.security.AllPermission;
-};
-
 grant codeBase "jrt:/jdk.localedata" {
     permission java.lang.RuntimePermission "accessClassInPackage.sun.text.*";
     permission java.lang.RuntimePermission "accessClassInPackage.sun.util.*";

diff --git a/src/jdk.jsobject/share/classes/module-info.java b/src/jdk.jsobject/share/classes/module-info.java
diff --git a/src/jdk.jsobject/share/classes/netscape/javascript/JSException.java b/src/jdk.jsobject/share/classes/netscape/javascript/JSException.java
diff --git a/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java b/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java
diff --git a/src/jdk.jsobject/share/classes/netscape/javascript/package-info.java b/src/jdk.jsobject/share/classes/netscape/javascript/package-info.java
diff --git a/test/hotspot/jtreg/applications/ctw/modules/jdk_jsobject.java b/test/hotspot/jtreg/applications/ctw/modules/jdk_jsobject.java
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list b/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list
@@ -302,8 +302,6 @@ jdk.jshell
 jdk.jshell.execution
 jdk.jshell.spi
 jdk.jshell.tool
-module:jdk.jsobject
-netscape.javascript
 module:jdk.jstatd
 module:jdk.localedata
 module:jdk.management

diff --git a/test/langtools/jdk/javadoc/doclet/testRecordTypes/jdk17/element-list b/test/langtools/jdk/javadoc/doclet/testRecordTypes/jdk17/element-list
@@ -251,8 +251,6 @@ jdk.jshell
 jdk.jshell.execution
 jdk.jshell.spi
 jdk.jshell.tool
-module:jdk.jsobject
-netscape.javascript
 module:jdk.jstatd
 module:jdk.localedata
 module:jdk.management
@@ -281,4 +279,4 @@ org.w3c.dom.css
 org.w3c.dom.html
 org.w3c.dom.stylesheets
 org.w3c.dom.xpath
-module:jdk.zipfs
+module:jdk.zipfs