The default implementation uses the implementation provided by this Context's
* {@link ContextFactory}.
*
+ *
This is no longer used in E4X -- an implementation is only provided for backward
+ * compatibility.
+ *
* @return An XMLLib.Factory. Should not return null if {@link #FEATURE_E4X} is
* enabled. See {@link #hasFeature}.
*/
+ @Deprecated
public XMLLib.Factory getE4xImplementationFactory() {
- return getFactory().getE4xImplementationFactory();
+ XMLLoader loader = ScriptRuntime.loadOneServiceImplementation(XMLLoader.class);
+ if (loader != null) {
+ return loader.getFactory();
+ }
+ return null;
}
/**
@@ -2682,10 +2691,7 @@ private static boolean frameMatches(StackTraceElement e) {
RegExpProxy getRegExpProxy() {
if (regExpProxy == null) {
- Class cl = Kit.classOrNull("org.mozilla.javascript.regexp.RegExpImpl");
- if (cl != null) {
- regExpProxy = (RegExpProxy) Kit.newInstanceOrNull(cl);
- }
+ regExpProxy = ScriptRuntime.loadOneServiceImplementation(RegExpProxy.class);
}
return regExpProxy;
}
diff --git a/rhino/src/main/java/org/mozilla/javascript/ContextFactory.java b/rhino/src/main/java/org/mozilla/javascript/ContextFactory.java
index 8f5939f47e..43eef0fa4c 100644
--- a/rhino/src/main/java/org/mozilla/javascript/ContextFactory.java
+++ b/rhino/src/main/java/org/mozilla/javascript/ContextFactory.java
@@ -295,42 +295,6 @@ protected boolean hasFeature(Context cx, int featureIndex) {
throw new IllegalArgumentException(String.valueOf(featureIndex));
}
- private static boolean isDom3Present() {
- Class nodeClass = Kit.classOrNull("org.w3c.dom.Node");
- if (nodeClass == null) return false;
- // Check to see whether DOM3 is present; use a new method defined in
- // DOM3 that is vital to our implementation
- try {
- nodeClass.getMethod("getUserData", String.class);
- return true;
- } catch (NoSuchMethodException e) {
- return false;
- }
- }
-
- /**
- * Provides a default {@link org.mozilla.javascript.xml.XMLLib.Factory XMLLib.Factory} to be
- * used by the Context instances produced by this factory. See {@link
- * Context#getE4xImplementationFactory} for details.
- *
- *
May return null, in which case E4X functionality is not supported in Rhino. - * - *
The default implementation now prefers the DOM3 E4X implementation.
- */
- protected org.mozilla.javascript.xml.XMLLib.Factory getE4xImplementationFactory() {
- // Must provide default implementation, rather than abstract method,
- // so that past implementors of ContextFactory do not fail at runtime
- // upon invocation of this method.
- // Note that the default implementation returns null if we
- // neither have XMLBeans nor a DOM3 implementation present.
-
- if (isDom3Present()) {
- return org.mozilla.javascript.xml.XMLLib.Factory.create(
- "org.mozilla.javascript.xmlimpl.XMLLibImpl");
- }
- return null;
- }
-
/**
* Create class loader for generated classes. This method creates an instance of the default
* implementation of {@link GeneratedClassLoader}. Rhino uses this interface to load generated
diff --git a/rhino/src/main/java/org/mozilla/javascript/ScriptRuntime.java b/rhino/src/main/java/org/mozilla/javascript/ScriptRuntime.java
index 5b9bbf5012..d85d6e123b 100644
--- a/rhino/src/main/java/org/mozilla/javascript/ScriptRuntime.java
+++ b/rhino/src/main/java/org/mozilla/javascript/ScriptRuntime.java
@@ -14,15 +14,18 @@
import java.text.MessageFormat;
import java.util.Arrays;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.Locale;
import java.util.Optional;
import java.util.ResourceBundle;
+import java.util.ServiceLoader;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import org.mozilla.javascript.ast.FunctionNode;
import org.mozilla.javascript.v8dtoa.DoubleConversion;
import org.mozilla.javascript.v8dtoa.FastDtoa;
import org.mozilla.javascript.xml.XMLLib;
+import org.mozilla.javascript.xml.XMLLoader;
import org.mozilla.javascript.xml.XMLObject;
/**
@@ -194,19 +197,15 @@ public static ScriptableObject initSafeStandardObjects(
NativeJavaObject.init(scope, sealed);
NativeJavaMap.init(scope, sealed);
- boolean withXml =
- cx.hasFeature(Context.FEATURE_E4X) && cx.getE4xImplementationFactory() != null;
-
// define lazy-loaded properties using their class name
new LazilyLoadedCtor(
scope, "Continuation", "org.mozilla.javascript.NativeContinuation", sealed, true);
- if (withXml) {
- String xmlImpl = cx.getE4xImplementationFactory().getImplementationClassName();
- new LazilyLoadedCtor(scope, "XML", xmlImpl, sealed, true);
- new LazilyLoadedCtor(scope, "XMLList", xmlImpl, sealed, true);
- new LazilyLoadedCtor(scope, "Namespace", xmlImpl, sealed, true);
- new LazilyLoadedCtor(scope, "QName", xmlImpl, sealed, true);
+ if (cx.hasFeature(Context.FEATURE_E4X)) {
+ XMLLoader loader = loadOneServiceImplementation(XMLLoader.class);
+ if (loader != null) {
+ loader.load(scope, sealed);
+ }
}
if (((cx.getLanguageVersion() >= Context.VERSION_1_8)
@@ -5626,6 +5625,24 @@ public static void throwDeleteOnSuperPropertyNotAllowed() {
throw referenceError("msg.delete.super");
}
+ /**
+ * Load a single implementation of "serviceClass" using the ServiceLoader. If there are no
+ * implementations, return null. If there is more than one implementation, throw a fatal
+ * exception, since this indicates that the classpath was configured incorrectly.
+ */
+ static