@@ -414,7 +411,7 @@ public interface Unmarshaller {
* content tree.
*
*
- * Implements Unmarshal Global Root Element.
+ * Implements Unmarshal Global Root Element.
*
* @param f the file to unmarshal XML data from
* @return the newly created root object of the java content tree
@@ -425,7 +422,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If the file parameter is null
*/
@@ -437,7 +434,7 @@ public interface Unmarshaller {
* be incomplete when using this form of the unmarshal API.
*
*
- * Implements Unmarshal Global Root Element.
+ * Implements Unmarshal Global Root Element.
*
* @param is the InputStream to unmarshal XML data from
* @return the newly created root object of the java content tree
@@ -448,7 +445,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If the InputStream parameter is null
*/
@@ -461,7 +458,7 @@ public interface Unmarshaller {
* because a Reader does not provide the system ID.
*
*
- * Implements Unmarshal Global Root Element.
+ * Implements Unmarshal Global Root Element.
*
* @param reader the Reader to unmarshal XML data from
* @return the newly created root object of the java content tree
@@ -472,7 +469,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If the InputStream parameter is null
* @since 1.6, JAXB 2.0
@@ -484,7 +481,7 @@ public interface Unmarshaller {
* content tree.
*
*
- * Implements Unmarshal Global Root Element.
+ * Implements Unmarshal Global Root Element.
*
* @param url the url to unmarshal XML data from
* @return the newly created root object of the java content tree
@@ -495,7 +492,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If the URL parameter is null
*/
@@ -506,7 +503,7 @@ public interface Unmarshaller {
* resulting content tree.
*
*
- * Implements Unmarshal Global Root Element.
+ * Implements Unmarshal Global Root Element.
*
* @param source the input source to unmarshal XML data from
* @return the newly created root object of the java content tree
@@ -517,7 +514,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If the InputSource parameter is null
*/
@@ -528,7 +525,7 @@ public interface Unmarshaller {
* content tree.
*
*
- * Implements Unmarshal Global Root Element.
+ * Implements Unmarshal Global Root Element.
*
* @param node
* the document/element to unmarshal XML data from.
@@ -541,7 +538,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If the Node parameter is null
* @see #unmarshal(org.w3c.dom.Node, Class)
@@ -553,7 +550,7 @@ public interface Unmarshaller {
* and return the resulting content tree.
*
*
- * Implements Unmarshal by Declared Type
+ * Implements Unmarshal by Declared Type
*
* @param node
* the document/element to unmarshal XML data from.
@@ -561,7 +558,7 @@ public interface Unmarshaller {
* @param declaredType
* appropriate JAXB mapped class to hold {@code node}'s XML data.
*
- * @return JAXB Element representation of {@code node}
+ * @return JAXB Element representation of {@code node}
*
* @throws JAXBException
* If any unexpected errors occur while unmarshalling
@@ -569,7 +566,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If any parameter is null
* @since 1.6, JAXB 2.0
@@ -581,7 +578,7 @@ public interface Unmarshaller {
* resulting content tree.
*
*
- * Implements Unmarshal Global Root Element.
+ * Implements Unmarshal Global Root Element.
*
*
*
@@ -627,7 +624,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If the Source parameter is null
* @see #unmarshal(javax.xml.transform.Source, Class)
@@ -641,16 +638,16 @@ public interface Unmarshaller {
* resulting content tree.
*
*
- * Implements Unmarshal by Declared Type
+ * Implements Unmarshal by Declared Type
*
*
- * See SAX 2.0 Parser Pluggability
+ * See SAX 2.0 Parser Pluggability
*
* @param source the XML Source to unmarshal XML data from (providers are
* only required to support SAXSource, DOMSource, and StreamSource)
* @param declaredType
* appropriate JAXB mapped class to hold {@code source}'s xml root element
- * @return Java content rooted by JAXB Element
+ * @return Java content rooted by JAXB Element
*
* @throws JAXBException
* If any unexpected errors occur while unmarshalling
@@ -658,7 +655,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If any parameter is null
* @since 1.6, JAXB 2.0
@@ -671,7 +668,7 @@ public interface Unmarshaller {
* resulting content tree.
*
*
- * Implements Unmarshal Global Root Element.
+ * Implements Unmarshal Global Root Element.
*
*
* This method assumes that the parser is on a START_DOCUMENT or
@@ -691,7 +688,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If the {@code reader} parameter is null
* @throws IllegalStateException
@@ -708,7 +705,7 @@ public interface Unmarshaller {
* and return the resulting content tree.
*
*
- * This method implements unmarshal by declaredType.
+ * This method implements unmarshal by declaredType.
*
* This method assumes that the parser is on a START_DOCUMENT or
* START_ELEMENT event. Unmarshalling will be done from this
@@ -721,7 +718,7 @@ public interface Unmarshaller {
* @param declaredType
* appropriate JAXB mapped class to hold {@code reader}'s START_ELEMENT XML data.
*
- * @return content tree rooted by JAXB Element representation
+ * @return content tree rooted by JAXB Element representation
*
* @throws JAXBException
* If any unexpected errors occur while unmarshalling
@@ -729,7 +726,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If any parameter is null
* @since 1.6, JAXB 2.0
@@ -741,7 +738,7 @@ public interface Unmarshaller {
* resulting content tree.
*
*
- * This method is an Unmarshal Global Root method.
+ * This method is an Unmarshal Global Root method.
*
*
* This method assumes that the parser is on a START_DOCUMENT or
@@ -761,7 +758,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If the {@code reader} parameter is null
* @throws IllegalStateException
@@ -778,7 +775,7 @@ public interface Unmarshaller {
* and return the resulting content tree.
*
*
- * This method implements unmarshal by declaredType.
+ * This method implements unmarshal by declaredType.
*
*
* This method assumes that the parser is on a START_DOCUMENT or
@@ -792,7 +789,7 @@ public interface Unmarshaller {
* @param declaredType
* appropriate JAXB mapped class to hold {@code reader}'s START_ELEMENT XML data.
*
- * @return content tree rooted by JAXB Element representation
+ * @return content tree rooted by JAXB Element representation
*
* @throws JAXBException
* If any unexpected errors occur while unmarshalling
@@ -800,7 +797,7 @@ public interface Unmarshaller {
* If the {@link ValidationEventHandler ValidationEventHandler}
* returns false from its {@code handleEvent} method or the
* {@code Unmarshaller} is unable to perform the XML to Java
- * binding. See Unmarshalling XML Data
+ * binding. See Unmarshalling XML Data
* @throws IllegalArgumentException
* If any parameter is null
* @since 1.6, JAXB 2.0
@@ -913,7 +910,7 @@ public interface Unmarshaller {
* {@code Unmarshaller}. This method can only be used to set one of
* the standard JAXB defined properties above or a provider specific
* property. Attempting to set an undefined property will result in
- * a PropertyException being thrown. See
+ * a PropertyException being thrown. See
* Supported Properties.
*
* @param name the name of the property to be set. This value can either
@@ -934,7 +931,7 @@ public interface Unmarshaller {
* {@code Unmarshaller}. This method can only be used to get one of
* the standard JAXB defined properties above or a provider specific
* property. Attempting to get an undefined property will result in
- * a PropertyException being thrown. See
+ * a PropertyException being thrown. See
* Supported Properties.
*
* @param name the name of the property to retrieve
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNsForm.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNsForm.java
index 4dfd5fa1176f4d19f242109f8ead2fe47b5c6901..a9d405aa4902a8608ade2c222bb280eb7898ff3c 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNsForm.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNsForm.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -36,23 +36,26 @@ package javax.xml.bind.annotation;
* The namespace qualification values are used in the annotations
* defined in this packge. The enumeration values are mapped as follows:
*
- *
- *
+ *
+ * Mapping of enumeration values
+ *
*
- * Enum Value |
- * XML Schema Value |
+ * Enum Value |
+ * XML Schema Value |
*
+ *
*
- *
- * UNQUALIFIED |
+ *
+ *
+ * UNQUALIFIED |
* unqualified |
*
- *
- * QUALIFIED |
+ *
+ * QUALIFIED |
* qualified |
*
- *
- * UNSET |
+ *
+ * UNSET |
* namespace qualification attribute is absent from the
* XML Schema fragment |
*
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java
index d2c9ea6d0f93cea92d6dd69ffa1c860809a64ffe..982185649f1f8d356a84c2134068b0595d420473 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -113,58 +113,60 @@ import java.lang.annotation.Target;
* complex type or simple type. The notational symbols used in the table are:
*
* - {@literal ->} : represents a mapping
- * - [x]+ : one or more occurances of x
+ * - [x]+ : one or more occurrences of x
* - [ {@code @XmlValue} property ]: JavaBean property annotated with
* {@code @XmlValue}
* - X : don't care
*
*
- *
- *
+ *
+ *
*
- * Target |
- * propOrder |
- * ClassBody |
- * ComplexType |
- * SimpleType |
+ * Target |
+ * propOrder |
+ * ClassBody |
+ * ComplexType |
+ * SimpleType |
*
+ *
*
- *
+ *
+ *
* Class |
* {} |
- * [property]+ {@literal ->} elements |
+ * [property]+ {@literal ->} elements |
* complexcontent xs:all |
* |
*
*
- *
+ *
* Class |
* non empty |
- * [property]+ {@literal ->} elements |
+ * [property]+ {@literal ->} elements |
* complexcontent xs:sequence |
* |
*
*
- *
+ *
* Class |
* X |
- * no property {@literal ->} element |
+ * no property {@literal ->} element |
* complexcontent empty sequence |
* |
*
*
- *
+ *
* Class |
* X |
- * 1 [{@code @XmlValue} property] {@literal &&} [property]+ {@literal ->} attributes |
+ * 1 [{@code @XmlValue} property] {@literal &&} [property]+ {@literal ->} attributes |
* simplecontent |
* |
*
*
- *
+ *
* Class |
* X |
- * 1 [{@code @XmlValue} property] {@literal &&} no properties {@literal ->} attribute |
+ * 1 [{@code @XmlValue} property] {@literal &&} no properties {@literal ->} attribute |
* |
* simpletype |
*
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package-info.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package-info.java
index d52ab7fa2bd6c406b307f5e5185cf999db4a757e..b76b94113257c6f6fd5ff137dcf9f68888a2a2ca 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package-info.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package-info.java
@@ -26,13 +26,13 @@
/**
* {@link javax.xml.bind.annotation.adapters.XmlAdapter} and its spec-defined
* sub-classes to allow arbitrary Java classes to be used with JAXB.
- *
+ *
*
Package Specification
- *
+ *
*
- *
+ *
*
Related Documentation
*
* For overviews, tutorials, examples, guides, and tool documentation,
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package.html b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package.html
deleted file mode 100644
index 02dbd93639d02982b316410c3f25aa6aab0c2b26..0000000000000000000000000000000000000000
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {@link javax.xml.bind.annotation.adapters.XmlAdapter} and its spec-defined
- sub-classes to allow arbitrary Java classes to be used with JAXB.
-
-
Package Specification
-
-
-
- Related Documentation
-
- For overviews, tutorials, examples, guides, and tool documentation,
- please see:
-
-
-
-
-
-
-
-
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html
index 4fc54e34dc484fca15f66bcff32c08a97bab7694..b249a29517c212c5ebeecaa6f27d38addaf8acbd 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html
@@ -1,6 +1,6 @@
-
+
-
-
-
-
-
-
-
-
-
-
- JAXB Provider Use Only: Provides partial default implementations for
- some of the javax.xml.bind
interfaces.
-
-
- JAXB Providers can extend these classes and implement the abstract
- methods.
-
-
Package Specification
-
-
-
- Related Documentation
-
- For overviews, tutorials, examples, guides, and tool documentation,
- please see:
-
-
-
-
-
-
-
-
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package-info.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package-info.java
index 229d4343fc217536bcd294aa48acdc4ff4629ec1..d6b3b7bdd71772da626e54410f7d8d4f1d1888a9 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package-info.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package-info.java
@@ -25,13 +25,13 @@
/**
* Useful client utility classes.
- *
+ *
*
Package Specification
- *
+ *
*
- *
+ *
*
Related Documentation
*
* For overviews, tutorials, examples, guides, and tool documentation,
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package.html b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package.html
deleted file mode 100644
index 21569c6738e603b259accc67a4879887f59c4f9a..0000000000000000000000000000000000000000
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- Useful client utility classes.
-
-
Package Specification
-
-
-
- Related Documentation
-
- For overviews, tutorials, examples, guides, and tool documentation,
- please see:
-
-
-
-
-
-
-
-
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
index 6b54294c6f2482d866e2f804c51f0d71a6722316..2028a863545299dac41375f04f4194f833f9fd30 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -145,7 +145,7 @@ public final class W3CEndpointReferenceBuilder {
* Sets the {@code endpointName} as
* {@code wsam:ServiceName/@EndpointName} in the
* {@code wsa:Metadata} element. This method can only be called
- * after the {@link #serviceName} method has been called.
+ * after the {@link #serviceName(QName)} method has been called.
*
* See
* 2.1 Referencing WSDL Metadata from an EPR for more details.