stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8186947: Fix accessibility and other issues in the java.xml.ws module

Browse Source 
Reviewed-by: lancea, mchung, darcy
This commit is contained in:
Jonathan Gibbons 2017-09-01 14:06:12 -07:00
parent 48cbb18e3d
commit fd552de5c5
14 changed files with 210 additions and 464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBPermission.java
View File

@ -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.
*
* <table border=1 cellpadding=5 summary="Permission target name, what the permission allows, and associated risks">
* <table class="striped">
* <caption style="display:none">Permission target name, what the permission allows, and associated risks"</caption>
* <thead>
* <tr>
* <th>Permission Target Name</th>
* <th>What the Permission Allows</th>
* <th>Risks of Allowing this Permission</th>
* <th scope="col">Permission Target Name</th>
* <th scope="col">What the Permission Allows</th>
* <th scope="col">Risks of Allowing this Permission</th>
* </tr>
* </thead>
*
* <tbody style="text-align:left">
* <tr>
* <td>setDatatypeConverter</td>
* <th scope="row">setDatatypeConverter</th>
* <td>
* 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.
* </td>
* </tr>
* </tbody>
* </table>
*
* @see java.security.BasicPermission

22
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java
View File

@ -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 <a href="#elementMarshalling">
* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @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 <a href="#elementMarshalling">
* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @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 <a href="#elementMarshalling">
* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @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 <a href="#elementMarshalling">
* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @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 <a href="#elementMarshalling">
* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @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 <a href="#elementMarshalling">
* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @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 <a href="#elementMarshalling">
* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @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 <a href="#elementMarshalling">
* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
* Marshalling a JAXB element</a>.
* @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 href="#supportedProps">
* a PropertyException being thrown. See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#supportedProps">
* Supported Properties</a>.
*
* @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 href="#supportedProps">
* a PropertyException being thrown. See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#supportedProps">
* Supported Properties</a>.
*
* @param name the name of the property to retrieve

93
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java
View File

@ -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
* <a href="#unmarshalGlobal">Unmarshal root element that is declared globally</a>.
* <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal root element that is declared globally</a>.
* 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
* <a href="#unmarshalByDeclaredType">unmarshal by declaredType methods</a>.
* <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">unmarshal by declaredType methods</a>.
* These methods are useful for unmarshalling XML data where
* the root element corresponds to a local element declaration in the schema.
* </blockquote>
@ -245,32 +245,29 @@ import java.io.Reader;
* instance are set.
*
* <a name="unmarshalDeclaredTypeReturn"></a>
* <table summary="" border="2" rules="all" cellpadding="4">
* <table class="striped">
* <caption>Unmarshal By Declared Type returned JAXBElement</caption>
* <thead>
* <tr>
* <th align="center" colspan="2">
* Unmarshal By Declared Type returned JAXBElement
* </tr>
* <tr>
* <th>JAXBElement Property</th>
* <th>Value</th>
* <th scope="col">JAXBElement Property</th>
* <th scope="col">Value</th>
* </tr>
* <tr>
* <td>name</td>
* <td>{@code xml element name}</td>
* <th scope="col">name</th>
* <th scope="col">{@code xml element name}</th>
* </tr>
* </thead>
* <tbody>
* <tr>
* <td>value</td>
* <th scope="row">value</th>
* <td>{@code instanceof declaredType}</td>
* </tr>
* <tr>
* <td>declaredType</td>
* <th scope="row">declaredType</th>
* <td>unmarshal method {@code declaredType} parameter</td>
* </tr>
* <tr>
* <td>scope</td>
* <th scope="row">scope</th>
* <td>{@code null} <i>(actual scope is unknown)</i></td>
* </tr>
* </tbody>
@ -279,7 +276,7 @@ import java.io.Reader;
*
* <p>
* The following is an example of
* <a href="#unmarshalByDeclaredType">unmarshal by declaredType method</a>.
* <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">unmarshal by declaredType method</a>.
* <p>
* Unmarshal by declaredType from a {@code org.w3c.dom.Node}:
* <blockquote>
@ -414,7 +411,7 @@ public interface Unmarshaller {
* content tree.
*
* <p>
* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* @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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @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.
*
* <p>
* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* @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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the InputStream parameter is null
*/
@ -461,7 +458,7 @@ public interface Unmarshaller {
* because a Reader does not provide the system ID.
*
* <p>
* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* @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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the InputStream parameter is null
* @since 1.6, JAXB 2.0
@ -484,7 +481,7 @@ public interface Unmarshaller {
* content tree.
*
* <p>
* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* @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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the URL parameter is null
*/
@ -506,7 +503,7 @@ public interface Unmarshaller {
* resulting content tree.
*
* <p>
* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* @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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the InputSource parameter is null
*/
@ -528,7 +525,7 @@ public interface Unmarshaller {
* content tree.
*
* <p>
* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* @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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @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.
*
* <p>
* Implements <a href="#unmarshalByDeclaredType">Unmarshal by Declared Type</a>
* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">Unmarshal by Declared Type</a>
*
* @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 <a href="#unmarshalDeclaredTypeReturn">JAXB Element</a> representation of {@code node}
* @return <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalDeclaredTypeReturn">JAXB Element</a> 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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If any parameter is null
* @since 1.6, JAXB 2.0
@ -581,7 +578,7 @@ public interface Unmarshaller {
* resulting content tree.
*
* <p>
* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* <p>
* <a name="saxParserPlugable"></a>
@ -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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @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.
*
* <p>
* Implements <a href="#unmarshalByDeclaredType">Unmarshal by Declared Type</a>
* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">Unmarshal by Declared Type</a>
*
* <p>
* See <a href="#saxParserPlugable">SAX 2.0 Parser Pluggability</a>
* See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#saxParserPlugable">SAX 2.0 Parser Pluggability</a>
*
* @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 <a href="#unmarshalDeclaredTypeReturn">JAXB Element</a>
* @return Java content rooted by <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalDeclaredTypeReturn">JAXB Element</a>
*
* @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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If any parameter is null
* @since 1.6, JAXB 2.0
@ -671,7 +668,7 @@ public interface Unmarshaller {
* resulting content tree.
*
* <p>
* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
*
* <p>
* 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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the {@code reader} parameter is null
* @throws IllegalStateException
@ -708,7 +705,7 @@ public interface Unmarshaller {
* and return the resulting content tree.
*
* <p>
* This method implements <a href="#unmarshalByDeclaredType">unmarshal by declaredType</a>.
* This method implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">unmarshal by declaredType</a>.
* <p>
* 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 <a href="#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
* @return content tree rooted by <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
*
* @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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If any parameter is null
* @since 1.6, JAXB 2.0
@ -741,7 +738,7 @@ public interface Unmarshaller {
* resulting content tree.
*
* <p>
* This method is an <a href="#unmarshalGlobal">Unmarshal Global Root method</a>.
* This method is an <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root method</a>.
*
* <p>
* 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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @throws IllegalArgumentException
* If the {@code reader} parameter is null
* @throws IllegalStateException
@ -778,7 +775,7 @@ public interface Unmarshaller {
* and return the resulting content tree.
*
* <p>
* This method implements <a href="#unmarshalByDeclaredType">unmarshal by declaredType</a>.
* This method implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">unmarshal by declaredType</a>.
*
* <p>
* 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 <a href="#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
* @return content tree rooted by <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
*
* @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 <a href="#unmarshalEx">Unmarshalling XML Data</a>
* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
* @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 href="#supportedProps">
* a PropertyException being thrown. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#supportedProps">
* Supported Properties</a>.
*
* @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 href="#supportedProps">
* a PropertyException being thrown. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#supportedProps">
* Supported Properties</a>.
*
* @param name the name of the property to retrieve

27
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlNsForm.java
View File

@ -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:
*
* <table summary="" border="1" cellpadding="4" cellspacing="3">
* <table class="striped">
* <caption style="display:none">Mapping of enumeration values</caption>
* <thead>
* <tr>
* <th scope="col">Enum Value</th>
* <th scope="col">XML Schema Value</th>
* </tr>
* </thead>
*
* <tbody>
* <tr>
* <td><b>Enum Value</b></td>
* <td><b>XML Schema Value</b></td>
* </tr>
*
* <tr valign="top">
* <td>UNQUALIFIED</td>
* <th scope="row">UNQUALIFIED</th>
* <td>unqualified</td>
* </tr>
* <tr valign="top">
* <td>QUALIFIED</td>
* <tr>
* <th scope="row">QUALIFIED</th>
* <td>qualified</td>
* </tr>
* <tr valign="top">
* <td>UNSET</td>
* <tr>
* <th scope="row">UNSET</th>
* <td>namespace qualification attribute is absent from the
* XML Schema fragment</td>
* </tr>

42
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlType.java
View File

@ -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:
* <ul>
* <li> {@literal ->} : represents a mapping </li>
* <li> [x]+ : one or more occurances of x </li>
* <li> [x]+ : one or more occurrences of x </li>
* <li> [ {@code @XmlValue} property ]: JavaBean property annotated with
* {@code @XmlValue}</li>
* <li> X : don't care
* </ul>
* <blockquote>
* <table summary="" border="1" cellpadding="4" cellspacing="3">
* <table class="striped">
* <thead>
* <tr>
* <th scope="col">Target</th>
* <th scope="col">propOrder</th>
* <th scope="col">ClassBody</th>
* <th scope="col">ComplexType</th>
* <th scope="col">SimpleType</th>
* </tr>
* </thead>
*
* <tbody>
* <tr>
* <td><b>Target</b></td>
* <td><b>propOrder</b></td>
* <td><b>ClassBody</b></td>
* <td><b>ComplexType</b></td>
* <td><b>SimpleType</b></td>
* </tr>
*
* <tr valign="top">
* <td>Class</td>
* <td>{}</td>
* <td>[property]+ {@literal ->} elements</td>
* <th scope="row">[property]+ {@literal ->} elements</th>
* <td>complexcontent<br>xs:all</td>
* <td> </td>
* </tr>
*
* <tr valign="top">
* <tr>
* <td>Class</td>
* <td>non empty</td>
* <td>[property]+ {@literal ->} elements</td>
* <th scope="row">[property]+ {@literal ->} elements</th>
* <td>complexcontent<br>xs:sequence</td>
* <td> </td>
* </tr>
*
* <tr valign="top">
* <tr>
* <td>Class</td>
* <td>X</td>
* <td>no property {@literal ->} element</td>
* <th scope="row">no property {@literal ->} element</th>
* <td>complexcontent<br>empty sequence</td>
* <td> </td>
* </tr>
*
* <tr valign="top">
* <tr>
* <td>Class</td>
* <td>X</td>
* <td>1 [{@code @XmlValue} property] {@literal &&} <br> [property]+ {@literal ->} attributes</td>
* <th scope="row">1 [{@code @XmlValue} property] {@literal &&} <br> [property]+ {@literal ->} attributes</th>
* <td>simplecontent</td>
* <td> </td>
* </tr>
*
* <tr valign="top">
* <tr>
* <td>Class</td>
* <td>X</td>
* <td>1 [{@code @XmlValue} property] {@literal &&} <br> no properties {@literal ->} attribute</td>
* <th scope="row">1 [{@code @XmlValue} property] {@literal &&} <br> no properties {@literal ->} attribute</th>
* <td> </td>
* <td>simpletype</td>
* </tr>

6
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package-info.java
View File

@ -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.
* <p>
*
* <h2>Package Specification</h2>
* <p>
*
* <ul>
* <li><a href="http://jcp.org/en/jsr/detail?id=222">JAXB Specification</a>
* </ul>
* <p>
*
* <h2>Related Documentation</h2>
* <p>
* For overviews, tutorials, examples, guides, and tool documentation,

57
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/package.html
View File

@ -1,57 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--
Copyright (c) 2004, 2013, 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
under the terms of the GNU General Public License version 2 only, as
published by the Free Software Foundation. Oracle designates this
particular file as subject to the "Classpath" exception as provided
by Oracle in the LICENSE file that accompanied this code.
This code is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
version 2 for more details (a copy is included in the LICENSE file that
accompanied this code).
You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
or visit www.oracle.com if you need additional information or have any
questions.
-->
<html>
<head>
</head>
<body>
<p>
{@link javax.xml.bind.annotation.adapters.XmlAdapter} and its spec-defined
sub-classes to allow arbitrary Java classes to be used with JAXB.
<h2>Package Specification</h2>
<ul>
<li><a href="http://jcp.org/en/jsr/detail?id=222">JAXB Specification</a>
</ul>
<h2>Related Documentation</h2>
For overviews, tutorials, examples, guides, and tool documentation,
please see:
<ul>
<li>The <a href="http://jaxb.java.net">JAXB Website</a>
</ul>
<!-- Put @see and @since tags down here. -->
</body>
</html>

244
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/package.html
View File

@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!DOCTYPE HTML>
<!--
Copyright (c) 2004, 2013, 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
@ -30,7 +30,7 @@
</head>
<body bgcolor="white">
<body>
<p>
Defines annotations for customizing Java program elements to XML Schema mapping.
@ -39,172 +39,92 @@
<p>The following table shows the JAXB mapping annotations
that can be associated with each program element. </p>
<table border="1" cellpadding="4" cellspacing="3">
<tbody>
<table class="striped">
<thead>
<tr>
<td><b>Program Element</b></td>
<td><b>JAXB annotation</b></td>
<th scope="col">Program Element</th>
<th scope="col">JAXB annotation</th>
</tr>
<tr valign="top">
<td><b>Package</b></td>
</thead>
<tbody style="text-align:left">
<tr>
<th scope="row" style="vertical-align:top">Package</th>
<td>
<table>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlSchema.html">XmlSchema</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaType.html">XmlSchemaType</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaTypes.html">XmlSchemaTypes</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.html">XmlJavaTypeAdapters</a></b></td>
</tr>
</table>
<ul style="list-style-type:none; padding-left:0; margin:0">
<li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlSchema.html">XmlSchema</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaType.html">XmlSchemaType</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaTypes.html">XmlSchemaTypes</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.html">XmlJavaTypeAdapters</a></li>
</ul>
</td>
</tr>
<tr valign="top">
<td><b>Class</b></td>
<tr>
<th scope="row" style="vertical-align:top">Class</th>
<td>
<table>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
</tr>
</table>
<ul style="list-style-type:none; padding-left:0; margin:0">
<li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
</ul>
</td>
</tr>
<tr valign="top">
<td><b>Enum type</b></td>
<tr>
<th scope="row" style="vertical-align:top">Enum type</th>
<td>
<table>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlEnum.html">XmlEnum</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlEnumValue.html">XmlEnumValue (enum constant only)</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
</tr>
</table>
<ul style="list-style-type:none; padding-left:0; margin:0">
<li><a HREF="../../../../javax/xml/bind/annotation/XmlEnum.html">XmlEnum</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlEnumValue.html">XmlEnumValue (enum constant only)</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
</ul>
</td>
</tr>
<tr valign="top">
<td><b>JavaBean Property/field</b></td>
<tr>
<th scope="row" style="vertical-align:top">JavaBean Property/field</th>
<td>
<table>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElement.html">XmlElement</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElements.html">XmlElements</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElementRef.html">XmlElementRef</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElementRefs.html">XmlElementRefs</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElementWrapper.html">XmlElementWrapper</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAnyElement.html">XmlAnyElement</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAttribute.html">XmlAttribute</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAnyAttribute.html">XmlAnyAttribute</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlTransient.html">XmlTransient</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlValue.html">XmlValue</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlID.html">XmlID</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlIDREF.html">XmlIDREF</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlMixed.html">XmlMixed</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElementDecl.html">XmlElementDecl (only on method)</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
</tr>
</table>
<ul style="list-style-type:none; padding-left:0; margin:0">
<li><a HREF="../../../../javax/xml/bind/annotation/XmlElement.html">XmlElement</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlElements.html">XmlElements</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlElementRef.html">XmlElementRef</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlElementRefs.html">XmlElementRefs</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlElementWrapper.html">XmlElementWrapper</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlAnyElement.html">XmlAnyElement</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlAttribute.html">XmlAttribute</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlAnyAttribute.html">XmlAnyAttribute</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlTransient.html">XmlTransient</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlValue.html">XmlValue</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlID.html">XmlID</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlIDREF.html">XmlIDREF</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlMixed.html">XmlMixed</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlElementDecl.html">XmlElementDecl (only on method)</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
</ul>
</td>
</tr>
<tr valign="top">
<td><b>Parameter</b></td>
<tr>
<th scope="row" style="vertical-align:top">Parameter</th>
<td>
<table>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></b></td>
</tr>
<tr valign="top">
<td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
</tr>
</table>
<ul style="list-style-type:none; padding-left:0; margin:0">
<li><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></li>
<li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
</ul>
</td>
</tr>
@ -252,26 +172,28 @@
<p>The following namespace prefixes are used in the XML Schema
fragments in this package.
<table border="1" cellpadding="4" cellspacing="3">
<tbody>
<table class="striped">
<thead>
<tr>
<td><b>Prefix</b></td>
<td><b>Namespace</b></td>
<td><b>Notes</b></td>
<th scope="col">Prefix</th>
<th scope="col">Namespace</th>
<th scope="col">Notes</th>
</tr>
</thead>
<tr valign="top">
<td>xs</td>
<tbody>
<tr>
<th scope="row">xs</th>
<td>http://www.w3.org/2001/XMLSchema</td>
<td>Namespace of XML Schema namespace</td>
</tr>
<tr valign="top">
<td>ref</td>
<tr>
<th scope="row">ref</th>
<td>http://ws-i.org/profiles/basic/1.1/xsd</td>
<td>Namespace for swaref schema component</td>
</tr>
<tr valign="top">
<td>xsi</td>
<tr>
<th scope="row">xsi</th>
<td>http://www.w3.org/2001/XMLSchema-instance</td>
<td>XML Schema namespace for instances</td>
</tr>

25
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java
View File

@ -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
@ -72,32 +72,29 @@ public abstract class AttachmentUnmarshaller {
*
* <p>The returned {@code DataHandler} instance must be configured
* to meet the following required mapping constaint.
* <table summary="" border="2" rules="all" cellpadding="4">
* <table class="striped">
* <caption>Required Mappings between MIME and Java Types</caption>
* <thead>
* <tr>
* <th align="center" colspan="2">
* Required Mappings between MIME and Java Types
* </tr>
* <tr>
* <th>MIME Type</th>
* <th>Java Type</th>
* <th scope="col">MIME Type</th>
* <th scope="col">Java Type</th>
* </tr>
* <tr>
* <th>{@code DataHandler.getContentType()}</th>
* <th>{@code instanceof DataHandler.getContent()}</th>
* <th scope="col">{@code DataHandler.getContentType()}</th>
* <th scope="col">{@code instanceof DataHandler.getContent()}</th>
* </tr>
* </thead>
* <tbody>
* <tbody style="text-align:left">
* <tr>
* <td>image/gif</td>
* <th scope="row">image/gif</th>
* <td>java.awt.Image</td>
* </tr>
* <tr>
* <td>image/jpeg</td>
* <th scope="row">image/jpeg</th>
* <td>java.awt.Image</td>
* </tr>
* <tr>
* <td>text/xml or application/xml</td>
* <th scope="row">text/xml or application/xml</th>
* <td>javax.xml.transform.Source</td>
* </tr>
* </tbody>

8
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package-info.java
View File

@ -26,17 +26,17 @@
/**
* <B>JAXB Provider Use Only:</b> Provides partial default implementations for
* some of the <code>javax.xml.bind</code> interfaces.
* <p>
*
* <p>
* JAXB Providers can extend these classes and implement the abstract
* methods.
* <p>
*
* <h2>Package Specification</h2>
* <p>
*
* <ul>
* <li><a href="https://jaxb.java.net/">JAXB Specification</a>
* </ul>
* <p>
*
* <h2>Related Documentation</h2>
* <p>
* For overviews, tutorials, examples, guides, and tool documentation,

64
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package.html
View File

@ -1,64 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--
Copyright (c) 2003, 2016, 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
under the terms of the GNU General Public License version 2 only, as
published by the Free Software Foundation. Oracle designates this
particular file as subject to the "Classpath" exception as provided
by Oracle in the LICENSE file that accompanied this code.
This code is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
version 2 for more details (a copy is included in the LICENSE file that
accompanied this code).
You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
or visit www.oracle.com if you need additional information or have any
questions.
-->
<html>
<head>
</head>
<body bgcolor="white">
<p>
<B>JAXB Provider Use Only:</b> Provides partial default implementations for
some of the <code>javax.xml.bind</code> interfaces.
<p>
JAXB Providers can extend these classes and implement the abstract
methods.
<h2>Package Specification</h2>
<ul>
<li><a href="https://jaxb.java.net/">JAXB
Specification</a>
</ul>
<h2>Related Documentation</h2>
For overviews, tutorials, examples, guides, and tool documentation,
please see:
<ul>
<li>The <a href="https://jaxb.java.net/">JAXB
Website</a>
</ul>
<!-- Put @see and @since tags down here. -->
</body>
</html>

6
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package-info.java
View File

@ -25,13 +25,13 @@
/**
* Useful client utility classes.
* <p>
*
* <h2>Package Specification</h2>
* <p>
*
* <ul>
* <li><a href="https://jaxb.java.net/">JAXB Specification</a>
* </ul>
* <p>
*
* <h2>Related Documentation</h2>
* <p>
* For overviews, tutorials, examples, guides, and tool documentation,

59
jaxws/src/java.xml.bind/share/classes/javax/xml/bind/util/package.html
View File

@ -1,59 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--
Copyright (c) 2003, 2016, 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
under the terms of the GNU General Public License version 2 only, as
published by the Free Software Foundation. Oracle designates this
particular file as subject to the "Classpath" exception as provided
by Oracle in the LICENSE file that accompanied this code.
This code is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
version 2 for more details (a copy is included in the LICENSE file that
accompanied this code).
You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
or visit www.oracle.com if you need additional information or have any
questions.
-->
<html>
<head>
</head>
<body bgcolor="white">
<p>
Useful client utility classes.
<h2>Package Specification</h2>
<ul>
<li><a href="https://jaxb.java.net/">JAXB
Specification</a>
</ul>
<h2>Related Documentation</h2>
For overviews, tutorials, examples, guides, and tool documentation,
please see:
<ul>
<li>The <a href="https://jaxb.java.net/">JAXB
Website</a>
</ul>
<!-- Put @see and @since tags down here. -->
</body>
</html>

4
jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
View File

@ -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.
* <p>
* See <a href="http://www.w3.org/TR/2007/REC-ws-addr-metadata-20070904/#refmetadatfromepr">
* 2.1 Referencing WSDL Metadata from an EPR</a> for more details.