diff --git a/jaxp/src/javax/xml/datatype/DatatypeFactory.java b/jaxp/src/javax/xml/datatype/DatatypeFactory.java index 4f9d6f67c23..56c796b10e9 100644 --- a/jaxp/src/javax/xml/datatype/DatatypeFactory.java +++ b/jaxp/src/javax/xml/datatype/DatatypeFactory.java @@ -49,7 +49,13 @@ import java.util.regex.Pattern; * *
  • * Uses the service-provider loading facilities, defined by the {@link java.util.ServiceLoader} class, to attempt - * to locate and load an implementation of the service. + * to locate and load an implementation of the service using the {@linkplain + * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: + * the service-provider loading facility will use the {@linkplain + * java.lang.Thread#getContextClassLoader() current thread's context class loader} + * to attempt to load the service. If the context class + * loader is null, the {@linkplain + * ClassLoader#getSystemClassLoader() system class loader} will be used. *
    * In case of {@link java.util.ServiceConfigurationError service * configuration error} a {@link javax.xml.datatype.DatatypeConfigurationException} diff --git a/jaxp/src/javax/xml/parsers/DocumentBuilderFactory.java b/jaxp/src/javax/xml/parsers/DocumentBuilderFactory.java index 748a1636f0a..04265f612e9 100644 --- a/jaxp/src/javax/xml/parsers/DocumentBuilderFactory.java +++ b/jaxp/src/javax/xml/parsers/DocumentBuilderFactory.java @@ -82,7 +82,13 @@ public abstract class DocumentBuilderFactory { *
  • * Uses the service-provider loading facilities, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an - * implementation of the service. + * implementation of the service using the {@linkplain + * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: + * the service-provider loading facility will use the {@linkplain + * java.lang.Thread#getContextClassLoader() current thread's context class loader} + * to attempt to load the service. If the context class + * loader is null, the {@linkplain + * ClassLoader#getSystemClassLoader() system class loader} will be used. *
    • *
  • * Otherwise, the system-default implementation is returned. diff --git a/jaxp/src/javax/xml/parsers/SAXParserFactory.java b/jaxp/src/javax/xml/parsers/SAXParserFactory.java index a7aef97bdf3..7163456780f 100644 --- a/jaxp/src/javax/xml/parsers/SAXParserFactory.java +++ b/jaxp/src/javax/xml/parsers/SAXParserFactory.java @@ -86,7 +86,13 @@ public abstract class SAXParserFactory { *
  • * Use the service-provider loading facilities, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an - * implementation of the service. + * implementation of the service using the {@linkplain + * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: + * the service-provider loading facility will use the {@linkplain + * java.lang.Thread#getContextClassLoader() current thread's context class loader} + * to attempt to load the service. If the context class + * loader is null, the {@linkplain + * ClassLoader#getSystemClassLoader() system class loader} will be used. *
    • *
  • * Otherwise the system-default implementation is returned. diff --git a/jaxp/src/javax/xml/stream/XMLEventFactory.java b/jaxp/src/javax/xml/stream/XMLEventFactory.java index d9e47ef0727..81a7c554bd9 100644 --- a/jaxp/src/javax/xml/stream/XMLEventFactory.java +++ b/jaxp/src/javax/xml/stream/XMLEventFactory.java @@ -84,7 +84,13 @@ public abstract class XMLEventFactory { *
  • * Use the service-provider loading facilities, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an - * implementation of the service. + * implementation of the service using the {@linkplain + * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: + * the service-provider loading facility will use the {@linkplain + * java.lang.Thread#getContextClassLoader() current thread's context class loader} + * to attempt to load the service. If the context class + * loader is null, the {@linkplain + * ClassLoader#getSystemClassLoader() system class loader} will be used. *
    • *
  • * Otherwise, the system-default implementation is returned. @@ -152,7 +158,13 @@ public abstract class XMLEventFactory { * If {@code factoryId} is "javax.xml.stream.XMLEventFactory", * use the service-provider loading facilities, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an - * implementation of the service. + * implementation of the service using the {@linkplain + * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: + * the service-provider loading facility will use the {@linkplain + * java.lang.Thread#getContextClassLoader() current thread's context class loader} + * to attempt to load the service. If the context class + * loader is null, the {@linkplain + * ClassLoader#getSystemClassLoader() system class loader} will be used. *
    • *
  • * Otherwise, throws a {@link FactoryConfigurationError}. diff --git a/jaxp/src/javax/xml/stream/XMLInputFactory.java b/jaxp/src/javax/xml/stream/XMLInputFactory.java index d894893eb6d..96bd13b2cfe 100644 --- a/jaxp/src/javax/xml/stream/XMLInputFactory.java +++ b/jaxp/src/javax/xml/stream/XMLInputFactory.java @@ -174,7 +174,13 @@ public abstract class XMLInputFactory { *
  • * Use the service-provider loading facilities, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an - * implementation of the service. + * implementation of the service using the {@linkplain + * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: + * the service-provider loading facility will use the {@linkplain + * java.lang.Thread#getContextClassLoader() current thread's context class loader} + * to attempt to load the service. If the context class + * loader is null, the {@linkplain + * ClassLoader#getSystemClassLoader() system class loader} will be used. *
    • *
  • * Otherwise, the system-default implementation is returned. @@ -242,7 +248,13 @@ public abstract class XMLInputFactory { * If {@code factoryId} is "javax.xml.stream.XMLInputFactory", * use the service-provider loading facilities, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an - * implementation of the service. + * implementation of the service using the {@linkplain + * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: + * the service-provider loading facility will use the {@linkplain + * java.lang.Thread#getContextClassLoader() current thread's context class loader} + * to attempt to load the service. If the context class + * loader is null, the {@linkplain + * ClassLoader#getSystemClassLoader() system class loader} will be used. *
    • *
  • * Otherwise, throws a {@link FactoryConfigurationError}. diff --git a/jaxp/src/javax/xml/stream/XMLOutputFactory.java b/jaxp/src/javax/xml/stream/XMLOutputFactory.java index a5a593c9cd0..55ced98941b 100644 --- a/jaxp/src/javax/xml/stream/XMLOutputFactory.java +++ b/jaxp/src/javax/xml/stream/XMLOutputFactory.java @@ -150,7 +150,13 @@ public abstract class XMLOutputFactory { *
  • * Use the service-provider loading facilities, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an - * implementation of the service. + * implementation of the service using the {@linkplain + * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: + * the service-provider loading facility will use the {@linkplain + * java.lang.Thread#getContextClassLoader() current thread's context class loader} + * to attempt to load the service. If the context class + * loader is null, the {@linkplain + * ClassLoader#getSystemClassLoader() system class loader} will be used. *
    • *
  • * Otherwise, the system-default implementation is returned. @@ -216,7 +222,13 @@ public abstract class XMLOutputFactory { * If {@code factoryId} is "javax.xml.stream.XMLOutputFactory", * use the service-provider loading facilities, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an - * implementation of the service. + * implementation of the service using the {@linkplain + * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: + * the service-provider loading facility will use the {@linkplain + * java.lang.Thread#getContextClassLoader() current thread's context class loader} + * to attempt to load the service. If the context class + * loader is null, the {@linkplain + * ClassLoader#getSystemClassLoader() system class loader} will be used. *
    • *
  • * Otherwise, throws a {@link FactoryConfigurationError}. diff --git a/jaxp/src/javax/xml/transform/TransformerFactory.java b/jaxp/src/javax/xml/transform/TransformerFactory.java index 9c4a076549d..cde66def0ea 100644 --- a/jaxp/src/javax/xml/transform/TransformerFactory.java +++ b/jaxp/src/javax/xml/transform/TransformerFactory.java @@ -77,7 +77,13 @@ public abstract class TransformerFactory { *
  • * Use the service-provider loading facilities, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an - * implementation of the service. + * implementation of the service using the {@linkplain + * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: + * the service-provider loading facility will use the {@linkplain + * java.lang.Thread#getContextClassLoader() current thread's context class loader} + * to attempt to load the service. If the context class + * loader is null, the {@linkplain + * ClassLoader#getSystemClassLoader() system class loader} will be used. *
    • *
  • * Otherwise, the system-default implementation is returned. diff --git a/jaxp/src/javax/xml/validation/SchemaFactory.java b/jaxp/src/javax/xml/validation/SchemaFactory.java index d99f45011f7..ebbbe405546 100644 --- a/jaxp/src/javax/xml/validation/SchemaFactory.java +++ b/jaxp/src/javax/xml/validation/SchemaFactory.java @@ -148,7 +148,14 @@ public abstract class SchemaFactory { *
  • * Use the service-provider loading facilities, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an - * implementation of the service.
    + * implementation of the service using the {@linkplain + * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: + * the service-provider loading facility will use the {@linkplain + * java.lang.Thread#getContextClassLoader() current thread's context class loader} + * to attempt to load the service. If the context class + * loader is null, the {@linkplain + * ClassLoader#getSystemClassLoader() system class loader} will be used. + *
    * Each potential service provider is required to implement the method * {@link #isSchemaLanguageSupported(String schemaLanguage)}. *
    diff --git a/jaxp/src/javax/xml/xpath/XPathFactory.java b/jaxp/src/javax/xml/xpath/XPathFactory.java index d4c60d60637..72de2b18d03 100644 --- a/jaxp/src/javax/xml/xpath/XPathFactory.java +++ b/jaxp/src/javax/xml/xpath/XPathFactory.java @@ -123,7 +123,13 @@ public abstract class XPathFactory { *
  • * Use the service-provider loading facilities, defined by the * {@link java.util.ServiceLoader} class, to attempt to locate and load an - * implementation of the service. + * implementation of the service using the {@linkplain + * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: + * the service-provider loading facility will use the {@linkplain + * java.lang.Thread#getContextClassLoader() current thread's context class loader} + * to attempt to load the service. If the context class + * loader is null, the {@linkplain + * ClassLoader#getSystemClassLoader() system class loader} will be used. *
    * Each potential service provider is required to implement the method * {@link #isObjectModelSupported(String objectModel)}.