diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBPermission.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBPermission.java index a4d221d1af3..59fba8da25d 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBPermission.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBPermission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 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 @@ -41,15 +41,19 @@ import java.security.BasicPermission; * and for each provides a description of what the permission allows * and a discussion of the risks of granting code the permission. * - * + *
+ * + * * - * - * - * + * + * + * * + * * + * * - * + * * * + * *
Permission target name, what the permission allows, and associated risks"
Permission Target NameWhat the Permission AllowsRisks of Allowing this PermissionPermission Target NameWhat the Permission AllowsRisks of Allowing this Permission
setDatatypeConvertersetDatatypeConverter * Allows the code to set VM-wide {@link DatatypeConverterInterface} * via {@link DatatypeConverter#setDatatypeConverter(DatatypeConverterInterface) the setDatatypeConverter method} @@ -63,6 +67,7 @@ import java.security.BasicPermission; * another application running in the same JVM. *
* * @see java.security.BasicPermission diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java index ccb1b634d5c..5240a5771a9 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -373,7 +373,7 @@ public interface Marshaller { * If the {@link ValidationEventHandler ValidationEventHandler} * returns false from its {@code handleEvent} method or the * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any - * object reachable from {@code jaxbElement}). See + * object reachable from {@code jaxbElement}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -395,7 +395,7 @@ public interface Marshaller { * If the {@link ValidationEventHandler ValidationEventHandler} * returns false from its {@code handleEvent} method or the * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any - * object reachable from {@code jaxbElement}). See + * object reachable from {@code jaxbElement}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -417,7 +417,7 @@ public interface Marshaller { * If the {@link ValidationEventHandler ValidationEventHandler} * returns false from its {@code handleEvent} method or the * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any - * object reachable from {@code jaxbElement}). See + * object reachable from {@code jaxbElement}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -440,7 +440,7 @@ public interface Marshaller { * If the {@link ValidationEventHandler ValidationEventHandler} * returns false from its {@code handleEvent} method or the * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any - * object reachable from {@code jaxbElement}). See + * object reachable from {@code jaxbElement}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -462,7 +462,7 @@ public interface Marshaller { * If the {@link ValidationEventHandler ValidationEventHandler} * returns false from its {@code handleEvent} method or the * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any - * object reachable from {@code jaxbElement}). See + * object reachable from {@code jaxbElement}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -488,7 +488,7 @@ public interface Marshaller { * If the {@link ValidationEventHandler ValidationEventHandler} * returns false from its {@code handleEvent} method or the * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any - * object reachable from {@code jaxbElement}). See + * object reachable from {@code jaxbElement}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -511,7 +511,7 @@ public interface Marshaller { * If the {@link ValidationEventHandler ValidationEventHandler} * returns false from its {@code handleEvent} method or the * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any - * object reachable from {@code jaxbElement}). See + * object reachable from {@code jaxbElement}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -535,7 +535,7 @@ public interface Marshaller { * If the {@link ValidationEventHandler ValidationEventHandler} * returns false from its {@code handleEvent} method or the * {@code Marshaller} is unable to marshal {@code jaxbElement} (or any - * object reachable from {@code jaxbElement}). See + * object reachable from {@code jaxbElement}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -575,7 +575,7 @@ public interface Marshaller { * {@code Marshaller}. 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 @@ -596,7 +596,7 @@ public interface Marshaller { * {@code Marshaller}. 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/Unmarshaller.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java index f8424dd1881..a1668787f54 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java @@ -186,13 +186,13 @@ import java.io.Reader; * Unmarshalling can deserialize XML data that represents either an entire XML document * or a subtree of an XML document. Typically, it is sufficient to use the * unmarshalling methods described by - * Unmarshal root element that is declared globally. + * Unmarshal root element that is declared globally. * These unmarshal methods utilize {@link JAXBContext}'s mapping of global XML element * declarations and type definitions to JAXB mapped classes to initiate the * unmarshalling of the root element of XML data. When the {@link JAXBContext}'s * mappings are not sufficient to unmarshal the root element of XML data, * the application can assist the unmarshalling process by using the - * unmarshal by declaredType methods. + * unmarshal by declaredType methods. * These methods are useful for unmarshalling XML data where * the root element corresponds to a local element declaration in the schema. * @@ -245,32 +245,29 @@ import java.io.Reader; * instance are set. * * - * + *
+ * * * - * - * - * - * + * + * * * - * - * + * + * * * * * - * + * * * * - * + * * * * - * + * * * * @@ -279,7 +276,7 @@ import java.io.Reader; * *

* The following is an example of - * unmarshal by declaredType method. + * unmarshal by declaredType method. *

* Unmarshal by declaredType from a {@code org.w3c.dom.Node}: *

@@ -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 4dfd5fa1176..a9d405aa490 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: * - *

Unmarshal By Declared Type returned JAXBElement
- * Unmarshal By Declared Type returned JAXBElement - *
JAXBElement PropertyValueJAXBElement PropertyValue
name{@code xml element name}name{@code xml element name}
valuevalue{@code instanceof declaredType}
declaredTypedeclaredTypeunmarshal method {@code declaredType} parameter
scopescope{@code null} (actual scope is unknown)
+ *
+ * + * + * + * + * + * + * + * * * - * - * - * - * - * - * + * * * - * - * + * + * * * - * - * + * + * * * 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 d2c9ea6d0f9..982185649f1 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: * *
- *
Mapping of enumeration values
Enum ValueXML Schema Value
Enum ValueXML Schema Value
UNQUALIFIEDUNQUALIFIEDunqualified
QUALIFIED
QUALIFIEDqualified
UNSET
UNSETnamespace qualification attribute is absent from the * XML Schema fragment
+ *
+ * + * + * + * + * + * + * + * + * + * * * - * - * - * - * - * - * - * - * * * - * + * * * * * - * + * * * - * + * * * * * - * + * * * - * + * * * * * - * + * * * - * + * * * * * - * + * * * - * + * * * * 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 d52ab7fa2bd..b76b9411325 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 02dbd93639d..00000000000 --- 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 4fc54e34dc4..b249a29517c 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 229d4343fc2..d6b3b7bdd71 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 21569c6738e..00000000000 --- 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 6b54294c6f2..2028a863545 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.

TargetpropOrderClassBodyComplexTypeSimpleType
TargetpropOrderClassBodyComplexTypeSimpleType
Class{}[property]+ {@literal ->} elements[property]+ {@literal ->} elementscomplexcontent
xs:all
Classnon empty[property]+ {@literal ->} elements[property]+ {@literal ->} elementscomplexcontent
xs:sequence
ClassXno property {@literal ->} elementno property {@literal ->} elementcomplexcontent
empty sequence
ClassX1 [{@code @XmlValue} property] {@literal &&}
[property]+ {@literal ->} attributes		1 [{@code @XmlValue} property] {@literal &&}
[property]+ {@literal ->} attributes		simplecontent
ClassX1 [{@code @XmlValue} property] {@literal &&}
no properties {@literal ->} attribute		1 [{@code @XmlValue} property] {@literal &&}
no properties {@literal ->} attribute		 simpletype