--- old/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java 2015-05-15 17:06:47.000000000 +0200 +++ new/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java 2015-05-15 17:06:46.000000000 +0200 @@ -45,29 +45,20 @@ * specialized forms of the method available: * *
- * SPEC REQUIREMENT: the provider must supply an implementation - * class containing the following method signatures: - * - *
{@code - * public static JAXBContext createContext( String contextPath, ClassLoader classLoader, Map- * *properties ) throws JAXBException - * public static JAXBContext createContext( Class[] classes, Map properties ) throws JAXBException - * }
* The following JAXB 1.0 requirement is only required for schema to * java interface/implementation binding. It does not apply to JAXB annotated @@ -146,7 +137,7 @@ * Section 4.2 Java Package of the specification. * *
- * SPEC REQUIREMENT: the provider must generate a class in each
+ * The provider must generate a class in each
* package that contains all of the necessary object factory methods for that
* package named ObjectFactory as well as the static
* newInstance( javaContentInterface ) method
@@ -214,6 +205,7 @@
* by the following steps.
*
*
* If such a file is discovered, it is {@link Properties#load(InputStream) loaded} as a property file, and
* the value of the {@link #JAXB_CONTEXT_FACTORY} key will be assumed to be the provider factory class.
- * This class is then loaded by the associated classloader discussed above.
+ * This class is then loaded by the associated class loader discussed above.
*
*
* This phase of the look up allows some packages to force the use of a certain JAXB implementation.
@@ -234,10 +226,54 @@
* factory class. This phase of the look up enables per-JVM override of the JAXB implementation.
*
*
+ *
*
*
*
+ * In case of {@link java.util.ServiceConfigurationError service
+ * configuration error} a {@link javax.xml.bind.JAXBException} will be thrown.
+ *
+ *
+ * public static JAXBContext createContext(
+ * String contextPath,
+ * ClassLoader classLoader,
+ * Map<String,Object> properties throws JAXBException
+ *
+ * public static JAXBContext createContext(
+ * Class[] classes,
+ * Map<String,Object> properties ) throws JAXBException
+ *
+ *
+ *
+ *
+ * public static JAXBContext createContext(
+ * String contextPath,
+ * ClassLoader classLoader,
+ * Map<String,Object> properties throws JAXBException
+ *
+ * public static JAXBContext createContext(
+ * Class[] classes,
+ * Map<String,Object> properties ) throws JAXBException
+ *
+ *
- * Once the provider factory class is discovered, its - * public static JAXBContext createContext(String,ClassLoader,Map) method - * (see {@link #newInstance(String, ClassLoader, Map)} for the parameter semantics.) - * or public static JAXBContext createContet(Class[],Map) method - * (see {@link #newInstance(Class[], Map)} for the parameter semantics) are invoked + * Once the provider factory class {@link javax.xml.bind.JAXBContextFactory} is discovered, one of its methods + * {@link javax.xml.bind.JAXBContextFactory#createContext(String, ClassLoader, java.util.Map)} or + * {@link javax.xml.bind.JAXBContextFactory#createContext(Class[], java.util.Map)} is invoked * to create a {@link JAXBContext}. * + *
+ * + * @apiNote + *Service discovery method using file /META-INF/services/javax.xml.bind.JAXBContext (described in step 4) + * and leveraging provider's static methods is supported only to allow backwards compatibility, but it is strongly + * recommended to migrate to standard ServiceLoader mechanism (described in step 3). + * + * @implNote + * Within the last step, if Glassfish AS environment detected, its specific service loader is used to find factory class. + * * @author
- * Obtain a new instance of a JAXBContext class. + * Create a new instance of a JAXBContext class. * *
* This is a convenience method to invoke the @@ -300,7 +342,7 @@ /** *
- * Obtain a new instance of a JAXBContext class. + * Create a new instance of a JAXBContext class. * *
* The client application must supply a context path which is a list of @@ -396,7 +438,7 @@ /** *
- * Obtain a new instance of a JAXBContext class. + * Create a new instance of a JAXBContext class. * *
* This is mostly the same as {@link JAXBContext#newInstance(String, ClassLoader)}, @@ -443,7 +485,7 @@ // TODO: resurrect this once we introduce external annotations // /** // *
-// * Obtain a new instance of a JAXBContext class. +// * Create a new instance of a JAXBContext class. // * // *
// * The client application must supply a list of classes that the new @@ -479,7 +521,7 @@ // * spec-defined classes will be returned. // * // * @return -// * A new instance of a JAXBContext. Always non-null valid object. +// * A new instance of a JAXBContext. // * // * @throws JAXBException // * if an error was encountered while creating the @@ -517,7 +559,7 @@ /** *
- * Obtain a new instance of a JAXBContext class. + * Create a new instance of a JAXBContext class. * *
* The client application must supply a list of classes that the new
@@ -559,7 +601,7 @@
* spec-defined classes will be returned.
*
* @return
- * A new instance of a JAXBContext. Always non-null valid object.
+ * A new instance of a JAXBContext.
*
* @throws JAXBException
* if an error was encountered while creating the
@@ -578,7 +620,7 @@
*
* @since 1.6, JAXB 2.0
*/
- public static JAXBContext newInstance( Class... classesToBeBound )
+ public static JAXBContext newInstance( Class> ... classesToBeBound )
throws JAXBException {
return newInstance(classesToBeBound,Collections.
- * Obtain a new instance of a JAXBContext class.
+ * Create a new instance of a JAXBContext class.
*
*
* An overloading of {@link JAXBContext#newInstance(Class...)}
@@ -605,7 +647,7 @@
* in an empty map.
*
* @return
- * A new instance of a JAXBContext. Always non-null valid object.
+ * A new instance of a JAXBContext.
*
* @throws JAXBException
* if an error was encountered while creating the
@@ -624,7 +666,7 @@
*
* @since 1.6, JAXB 2.0
*/
- public static JAXBContext newInstance( Class[] classesToBeBound, Map