mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-15 13:49:42 +02:00
8359760: Remove the jdk.jsobject module
Reviewed-by: rriggs, iris, alanb
This commit is contained in:
parent
e6ebefaa40
commit
594c080b2b
12 changed files with 4 additions and 362 deletions
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
|
@ -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
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
|
@ -51,7 +51,6 @@ DOCS_MODULES= \
|
|||
jdk.jdwp.agent \
|
||||
jdk.jfr \
|
||||
jdk.jlink \
|
||||
jdk.jsobject \
|
||||
jdk.jshell \
|
||||
jdk.jstatd \
|
||||
jdk.localedata \
|
||||
|
|
|
@ -62,7 +62,6 @@ UPGRADEABLE_PLATFORM_MODULES= \
|
|||
java.compiler \
|
||||
jdk.graal.compiler \
|
||||
jdk.graal.compiler.management \
|
||||
jdk.jsobject \
|
||||
#
|
||||
|
||||
PLATFORM_MODULES= \
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation. Oracle designates this
|
||||
* particular file as subject to the "Classpath" exception as provided
|
||||
* by Oracle in the LICENSE file that accompanied this code.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Defines the API for the JavaScript Object.
|
||||
*
|
||||
* @moduleGraph
|
||||
* @since 9
|
||||
* @deprecated The jdk.jsobject module will be delivered with JavaFX.
|
||||
*/
|
||||
@Deprecated(since = "24", forRemoval = true)
|
||||
module jdk.jsobject {
|
||||
exports netscape.javascript;
|
||||
}
|
|
@ -1,63 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation. Oracle designates this
|
||||
* particular file as subject to the "Classpath" exception as provided
|
||||
* by Oracle in the LICENSE file that accompanied this code.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package netscape.javascript;
|
||||
|
||||
/**
|
||||
* Thrown when an exception is raised in the JavaScript engine. This is merely
|
||||
* a marker class to indicate an exception relating to the JavaScript
|
||||
* interface.
|
||||
* @since 1.5
|
||||
* @deprecated The jdk.jsobject module will be delivered with JavaFX.
|
||||
*/
|
||||
@Deprecated(since = "24", forRemoval = true)
|
||||
public class JSException extends RuntimeException {
|
||||
private static final long serialVersionUID = 2778103758223661489L;
|
||||
|
||||
/**
|
||||
* Constructs a new JavaScript exception with null as it's detail message.
|
||||
*/
|
||||
public JSException() {
|
||||
super();
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct a new JavaScript exception with the specified detail message.
|
||||
*
|
||||
* @param s The detail message
|
||||
*/
|
||||
public JSException(String s) {
|
||||
super(s);
|
||||
}
|
||||
|
||||
/**
|
||||
* Construct a new JavaScript exception with the specified cause.
|
||||
*
|
||||
* @param t Throwable cause
|
||||
*/
|
||||
public JSException(Throwable t) {
|
||||
super(t);
|
||||
}
|
||||
}
|
|
@ -1,137 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation. Oracle designates this
|
||||
* particular file as subject to the "Classpath" exception as provided
|
||||
* by Oracle in the LICENSE file that accompanied this code.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package netscape.javascript;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Allows Java code to manipulate JavaScript objects.
|
||||
* </p>
|
||||
*
|
||||
* <p>
|
||||
* When a JavaScript object is passed or returned to Java code, it
|
||||
* is wrapped in an instance of {@code JSObject}. When a
|
||||
* {@code JSObject} instance is passed to the JavaScript engine,
|
||||
* it is unwrapped back to its original JavaScript object. The
|
||||
* {@code JSObject} class provides a way to invoke JavaScript
|
||||
* methods and examine JavaScript properties.
|
||||
* </p>
|
||||
*
|
||||
* <p> Any data returned from the JavaScript engine to Java is
|
||||
* converted to Java data types. Certain data passed to the JavaScript
|
||||
* engine is converted to JavaScript data types.
|
||||
* </p>
|
||||
* @since 1.5
|
||||
* @deprecated The jdk.jsobject module will be delivered with JavaFX.
|
||||
*/
|
||||
@Deprecated(since = "24", forRemoval = true)
|
||||
@SuppressWarnings("removal")
|
||||
public abstract class JSObject {
|
||||
/**
|
||||
* Constructs a new JSObject. Users should neither call this method nor
|
||||
* subclass JSObject.
|
||||
*/
|
||||
protected JSObject() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Calls a JavaScript method. Equivalent to
|
||||
* "this.methodName(args[0], args[1], ...)" in JavaScript.
|
||||
*
|
||||
* @param methodName The name of the JavaScript method to be invoked.
|
||||
* @param args the Java objects passed as arguments to the method.
|
||||
* @return Result of the method.
|
||||
* @throws JSException when an error is reported from the browser or
|
||||
* JavaScript engine.
|
||||
*/
|
||||
public abstract Object call(String methodName, Object... args) throws JSException;
|
||||
|
||||
/**
|
||||
* Evaluates a JavaScript expression. The expression is a string of
|
||||
* JavaScript source code which will be evaluated in the context given by
|
||||
* "this".
|
||||
*
|
||||
* @param s The JavaScript expression.
|
||||
* @return Result of the JavaScript evaluation.
|
||||
* @throws JSException when an error is reported from the browser or
|
||||
* JavaScript engine.
|
||||
*/
|
||||
public abstract Object eval(String s) throws JSException;
|
||||
|
||||
/**
|
||||
* Retrieves a named member of a JavaScript object. Equivalent to
|
||||
* "this.name" in JavaScript.
|
||||
*
|
||||
* @param name The name of the JavaScript property to be accessed.
|
||||
* @return The value of the property.
|
||||
* @throws JSException when an error is reported from the browser or
|
||||
* JavaScript engine.
|
||||
*/
|
||||
public abstract Object getMember(String name) throws JSException;
|
||||
|
||||
/**
|
||||
* Sets a named member of a JavaScript object. Equivalent to
|
||||
* "this.name = value" in JavaScript.
|
||||
*
|
||||
* @param name The name of the JavaScript property to be accessed.
|
||||
* @param value The value of the property.
|
||||
* @throws JSException when an error is reported from the browser or
|
||||
* JavaScript engine.
|
||||
*/
|
||||
public abstract void setMember(String name, Object value) throws JSException;
|
||||
|
||||
/**
|
||||
* Removes a named member of a JavaScript object. Equivalent
|
||||
* to "delete this.name" in JavaScript.
|
||||
*
|
||||
* @param name The name of the JavaScript property to be removed.
|
||||
* @throws JSException when an error is reported from the browser or
|
||||
* JavaScript engine.
|
||||
*/
|
||||
public abstract void removeMember(String name) throws JSException;
|
||||
|
||||
/**
|
||||
* Retrieves an indexed member of a JavaScript object. Equivalent to
|
||||
* "this[index]" in JavaScript.
|
||||
*
|
||||
* @param index The index of the array to be accessed.
|
||||
* @return The value of the indexed member.
|
||||
* @throws JSException when an error is reported from the browser or
|
||||
* JavaScript engine.
|
||||
*/
|
||||
public abstract Object getSlot(int index) throws JSException;
|
||||
|
||||
/**
|
||||
* Sets an indexed member of a JavaScript object. Equivalent to
|
||||
* "this[index] = value" in JavaScript.
|
||||
*
|
||||
* @param index The index of the array to be accessed.
|
||||
* @param value The value to set
|
||||
* @throws JSException when an error is reported from the browser or
|
||||
* JavaScript engine.
|
||||
*/
|
||||
public abstract void setSlot(int index, Object value) throws JSException;
|
||||
|
||||
}
|
|
@ -1,46 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation. Oracle designates this
|
||||
* particular file as subject to the "Classpath" exception as provided
|
||||
* by Oracle in the LICENSE file that accompanied this code.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* <b>Deprecated, for removal: This API element is subject to removal
|
||||
* in a future version.</b><br>
|
||||
* <em>The jdk.jsobject module will be delivered with JavaFX.</em>
|
||||
* </p>
|
||||
*
|
||||
* <p>
|
||||
* Provides Java code the ability to access the JavaScript engine and the
|
||||
* HTML DOM in the web browser.
|
||||
* </p>
|
||||
*
|
||||
* <p>
|
||||
* The classes in this package were initially specified by Netscape, and are the
|
||||
* de facto standard mechanism for calling JavaScript from the Java runtime.
|
||||
* </p>
|
||||
*
|
||||
* @since 1.5
|
||||
*/
|
||||
|
||||
package netscape.javascript;
|
|
@ -1,38 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @summary run CTW for all classes from jdk.jsobject module
|
||||
*
|
||||
* @library /test/lib / /testlibrary/ctw/src
|
||||
* @modules java.base/jdk.internal.access
|
||||
* java.base/jdk.internal.jimage
|
||||
* java.base/jdk.internal.misc
|
||||
* java.base/jdk.internal.reflect
|
||||
* @modules jdk.jsobject
|
||||
*
|
||||
* @build jdk.test.whitebox.WhiteBox
|
||||
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
|
||||
* @run driver/timeout=7200 sun.hotspot.tools.ctw.CtwRunner modules:jdk.jsobject
|
||||
*/
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
|
@ -45,8 +45,7 @@ public class UpgradeableModules {
|
|||
private static final List<String> UPGRADEABLE_MODULES =
|
||||
List.of("java.compiler",
|
||||
"jdk.graal.compiler",
|
||||
"jdk.graal.compiler.management",
|
||||
"jdk.jsobject");
|
||||
"jdk.graal.compiler.management");
|
||||
|
||||
|
||||
public static void main(String... args) {
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8343780
|
||||
* @summary Test for `@since` in jdk.jsobject module
|
||||
* @library /test/lib /test/jdk/tools/sincechecker
|
||||
* @run main SinceChecker jdk.jsobject
|
||||
*/
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue