Skip to content

Commit 4842f50

Browse files
WIP: Remove jdk.jsobject module
1 parent 779947c commit 4842f50

File tree

11 files changed

+2
-333
lines changed

11 files changed

+2
-333
lines changed

bin/unshuffle_list.txt

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ src/jdk.jdi : jdk/src/jdk.jdi
7878
src/jdk.jdwp.agent : jdk/src/jdk.jdwp.agent
7979
src/jdk.jlink : jdk/src/jdk.jlink
8080
src/jdk.jshell : langtools/src/jdk.jshell
81-
src/jdk.jsobject : jdk/src/jdk.jsobject
8281
src/jdk.jstatd : jdk/src/jdk.jstatd
8382
src/jdk.localedata : jdk/src/jdk.localedata
8483
src/jdk.management : jdk/src/jdk.management

make/conf/docs-modules.conf

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ DOCS_MODULES= \
5151
jdk.jdwp.agent \
5252
jdk.jfr \
5353
jdk.jlink \
54-
jdk.jsobject \
5554
jdk.jshell \
5655
jdk.jstatd \
5756
jdk.localedata \

make/conf/module-loader-map.conf

-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ UPGRADEABLE_PLATFORM_MODULES= \
6262
java.compiler \
6363
jdk.graal.compiler \
6464
jdk.graal.compiler.management \
65-
jdk.jsobject \
6665
#
6766

6867
PLATFORM_MODULES= \
@@ -123,7 +122,6 @@ NATIVE_ACCESS_MODULES= \
123122
jdk.internal.le \
124123
jdk.internal.vm.ci \
125124
jdk.jfr \
126-
jdk.jsobject \
127125
jdk.localedata \
128126
jdk.management \
129127
jdk.management.agent \

src/jdk.jsobject/share/classes/module-info.java

-37
This file was deleted.

src/jdk.jsobject/share/classes/netscape/javascript/JSException.java

-64
This file was deleted.

src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java

-137
This file was deleted.

src/jdk.jsobject/share/classes/netscape/javascript/package-info.java

-46
This file was deleted.

test/hotspot/jtreg/applications/ctw/modules/jdk_jsobject.java

-38
This file was deleted.

test/jdk/jdk/modules/etc/UpgradeableModules.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ public class UpgradeableModules {
4545
private static final List<String> UPGRADEABLE_MODULES =
4646
List.of("java.compiler",
4747
"jdk.graal.compiler",
48-
"jdk.graal.compiler.management",
49-
"jdk.jsobject");
48+
"jdk.graal.compiler.management");
5049

5150

5251
public static void main(String... args) {

test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list

-2
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,6 @@ jdk.jshell
302302
jdk.jshell.execution
303303
jdk.jshell.spi
304304
jdk.jshell.tool
305-
module:jdk.jsobject
306-
netscape.javascript
307305
module:jdk.jstatd
308306
module:jdk.localedata
309307
module:jdk.management

test/langtools/jdk/javadoc/doclet/testRecordTypes/jdk17/element-list

+1-3
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,6 @@ jdk.jshell
251251
jdk.jshell.execution
252252
jdk.jshell.spi
253253
jdk.jshell.tool
254-
module:jdk.jsobject
255-
netscape.javascript
256254
module:jdk.jstatd
257255
module:jdk.localedata
258256
module:jdk.management
@@ -281,4 +279,4 @@ org.w3c.dom.css
281279
org.w3c.dom.html
282280
org.w3c.dom.stylesheets
283281
org.w3c.dom.xpath
284-
module:jdk.zipfs
282+
module:jdk.zipfs

0 commit comments

Comments
 (0)