From 291002bb8ef7fcfed477295a0e35cc780f0c6daa Mon Sep 17 00:00:00 2001 From: Alexander Stepanov Date: Thu, 24 Sep 2015 18:26:42 +0300 Subject: [PATCH] 8133651: replace some tags (obsolete in html5) in core-libs docs Reviewed-by: martin --- .../xml/internal/bind/CycleRecoverable.java | 2 +- .../com/sun/xml/internal/bind/IDResolver.java | 6 +- .../internal/bind/annotation/XmlIsSet.java | 12 +- .../xml/internal/bind/api/ClassResolver.java | 2 +- .../xml/internal/bind/api/JAXBRIContext.java | 12 +- .../marshaller/NamespacePrefixMapper.java | 12 +- .../internal/bind/v2/model/core/Adapter.java | 4 +- .../bind/v2/model/core/ClassInfo.java | 4 +- .../v2/model/core/ElementPropertyInfo.java | 8 +- .../bind/v2/model/core/MapPropertyInfo.java | 4 +- .../bind/v2/model/core/TypeInfoSet.java | 2 +- .../bind/v2/model/impl/AnyTypeImpl.java | 2 +- .../bind/v2/model/impl/TypeInfoSetImpl.java | 2 +- .../v2/model/nav/GenericArrayTypeImpl.java | 4 +- .../internal/bind/v2/model/nav/Navigator.java | 10 +- .../v2/model/nav/ReflectionNavigator.java | 2 +- .../v2/model/runtime/RuntimeArrayInfo.java | 2 +- .../bind/v2/runtime/AnyTypeBeanInfo.java | 2 +- .../runtime/IllegalAnnotationException.java | 14 +- .../bind/v2/runtime/JAXBContextImpl.java | 4 +- .../internal/bind/v2/runtime/JaxBeanInfo.java | 2 +- .../bind/v2/runtime/XMLSerializer.java | 4 +- .../property/SingleMapNodeProperty.java | 4 +- .../bind/v2/runtime/reflect/Accessor.java | 2 +- .../bind/v2/runtime/unmarshaller/Loader.java | 2 +- .../runtime/unmarshaller/MTOMDecorator.java | 6 +- .../unmarshaller/UnmarshallingContext.java | 4 +- .../xml/internal/bind/v2/schemagen/Form.java | 2 +- .../bind/v2/schemagen/XmlSchemaGenerator.java | 5 +- .../xml/internal/bind/v2/util/QNameMap.java | 4 +- .../jvnet/mimepull/MIMEParsingException.java | 9 +- .../org/jvnet/staxex/NamespaceContextEx.java | 10 +- .../org/jvnet/staxex/XMLStreamReaderEx.java | 2 +- .../com/sun/xml/internal/txw2/Document.java | 2 +- .../sun/xml/internal/txw2/TypedXmlWriter.java | 2 +- .../txw2/annotation/XmlAttribute.java | 6 +- .../internal/txw2/annotation/XmlElement.java | 6 +- .../internal/txw2/annotation/XmlValue.java | 6 +- .../xml/internal/txw2/output/DataWriter.java | 16 +- .../xml/internal/txw2/output/XMLWriter.java | 80 +++---- .../share/classes/javax/xml/bind/Binder.java | 32 +-- .../javax/xml/bind/DataBindingException.java | 2 +- .../javax/xml/bind/DatatypeConverter.java | 26 +-- .../xml/bind/DatatypeConverterInterface.java | 26 +-- .../share/classes/javax/xml/bind/JAXB.java | 32 +-- .../javax/xml/bind/JAXBContextFactory.java | 14 +- .../classes/javax/xml/bind/JAXBElement.java | 38 ++-- .../classes/javax/xml/bind/JAXBException.java | 2 +- .../javax/xml/bind/JAXBIntrospector.java | 2 +- .../javax/xml/bind/MarshalException.java | 2 +- .../classes/javax/xml/bind/Marshaller.java | 117 +++++----- .../xml/bind/TypeConstraintException.java | 2 +- .../javax/xml/bind/UnmarshalException.java | 2 +- .../classes/javax/xml/bind/Unmarshaller.java | 212 +++++++++--------- .../javax/xml/bind/ValidationEvent.java | 4 +- .../xml/bind/ValidationEventHandler.java | 12 +- .../xml/bind/ValidationEventLocator.java | 8 +- .../javax/xml/bind/ValidationException.java | 2 +- .../classes/javax/xml/bind/Validator.java | 54 ++--- .../xml/bind/annotation/XmlAccessorOrder.java | 10 +- .../xml/bind/annotation/XmlAccessorType.java | 16 +- .../xml/bind/annotation/XmlAnyAttribute.java | 6 +- .../xml/bind/annotation/XmlAttribute.java | 2 +- .../javax/xml/bind/annotation/XmlElement.java | 4 +- .../xml/bind/annotation/XmlElementDecl.java | 10 +- .../xml/bind/annotation/XmlElementRef.java | 22 +- .../bind/annotation/XmlElementWrapper.java | 6 +- .../xml/bind/annotation/XmlElements.java | 4 +- .../javax/xml/bind/annotation/XmlEnum.java | 6 +- .../xml/bind/annotation/XmlEnumValue.java | 6 +- .../javax/xml/bind/annotation/XmlID.java | 14 +- .../javax/xml/bind/annotation/XmlIDREF.java | 20 +- .../bind/annotation/XmlInlineBinaryData.java | 4 +- .../javax/xml/bind/annotation/XmlList.java | 6 +- .../javax/xml/bind/annotation/XmlNs.java | 4 +- .../javax/xml/bind/annotation/XmlSchema.java | 16 +- .../xml/bind/annotation/XmlSchemaType.java | 8 +- .../xml/bind/annotation/XmlSchemaTypes.java | 2 +- .../javax/xml/bind/annotation/XmlSeeAlso.java | 10 +- .../xml/bind/annotation/XmlTransient.java | 8 +- .../javax/xml/bind/annotation/XmlType.java | 54 ++--- .../javax/xml/bind/annotation/XmlValue.java | 8 +- .../adapters/CollapsedStringAdapter.java | 2 +- .../annotation/adapters/HexBinaryAdapter.java | 4 +- .../adapters/NormalizedStringAdapter.java | 2 +- .../bind/annotation/adapters/XmlAdapter.java | 10 +- .../adapters/XmlJavaTypeAdapter.java | 18 +- .../adapters/XmlJavaTypeAdapters.java | 2 +- .../bind/attachment/AttachmentMarshaller.java | 2 +- .../attachment/AttachmentUnmarshaller.java | 30 +-- .../bind/helpers/AbstractMarshallerImpl.java | 2 +- .../helpers/AbstractUnmarshallerImpl.java | 6 +- .../javax/xml/bind/helpers/package.html | 2 +- .../share/classes/javax/xml/bind/package.html | 2 +- .../messaging/saaj/SOAPExceptionImpl.java | 2 +- .../ws/addressing/WsaPropertyBag.java | 10 +- .../sun/xml/internal/ws/api/BindingID.java | 4 +- .../xml/internal/ws/api/BindingIDFactory.java | 2 +- .../sun/xml/internal/ws/api/Cancelable.java | 10 +- .../ws/api/client/ClientPipelineHook.java | 2 +- .../ws/api/client/ServiceInterceptor.java | 2 +- .../xml/internal/ws/api/message/Header.java | 4 +- .../internal/ws/api/message/HeaderList.java | 51 ++--- .../xml/internal/ws/api/message/Message.java | 4 +- .../xml/internal/ws/api/message/Packet.java | 4 +- .../xml/internal/ws/api/model/Parameter.java | 6 +- .../sun/xml/internal/ws/api/pipe/Codec.java | 4 +- .../sun/xml/internal/ws/api/pipe/Fiber.java | 8 +- .../pipe/FiberContextSwitchInterceptor.java | 2 +- .../sun/xml/internal/ws/api/pipe/Pipe.java | 4 +- .../ws/api/pipe/PipelineAssemblerFactory.java | 2 +- .../sun/xml/internal/ws/api/pipe/Stubs.java | 8 +- .../sun/xml/internal/ws/api/pipe/Tube.java | 4 +- .../ws/api/pipe/TubelineAssemblerFactory.java | 2 +- .../xml/internal/ws/api/server/Container.java | 8 +- .../xml/internal/ws/api/server/Invoker.java | 2 +- .../ws/api/server/ServerPipelineHook.java | 4 +- .../internal/ws/api/server/WSEndpoint.java | 8 +- .../xml/internal/ws/api/server/WebModule.java | 2 +- .../api/wsdl/parser/WSDLParserExtension.java | 2 +- .../internal/ws/client/RequestContext.java | 2 +- .../com/sun/xml/internal/ws/client/Stub.java | 8 +- .../internal/ws/client/WSServiceDelegate.java | 4 +- .../internal/ws/client/sei/ValueSetter.java | 8 +- .../ws/commons/xmlutil/Converter.java | 2 +- .../ws/developer/JAXWSProperties.java | 8 +- .../ws/message/AbstractHeaderImpl.java | 2 +- .../internal/ws/message/jaxb/JAXBMessage.java | 2 +- .../xml/internal/ws/model/ParameterImpl.java | 4 +- .../ws/policy/privateutil/PolicyUtils.java | 4 +- .../ws/policy/privateutil/ServiceFinder.java | 28 +-- .../policy/sourcemodel/PolicySourceModel.java | 2 +- .../ws/server/sei/EndpointValueSetter.java | 8 +- .../internal/ws/spi/db/BindingContext.java | 2 +- .../xml/internal/ws/spi/db/BindingHelper.java | 10 +- .../ws/transport/http/WSHTTPConnection.java | 8 +- .../transport/http/server/ServerAdapter.java | 2 +- .../sun/xml/internal/ws/util/QNameMap.java | 4 +- .../xml/internal/ws/util/ServiceFinder.java | 28 +-- .../xml/internal/ws/util/pipe/DumpTube.java | 2 +- .../ws/wsdl/parser/RuntimeWSDLParser.java | 10 +- .../classes/javax/xml/soap/SOAPException.java | 2 +- .../javax/xml/ws/WebServiceException.java | 9 +- .../javax/xml/ws/spi/http/HttpExchange.java | 10 +- .../com/sun/codemodel/internal/JClass.java | 22 +- .../codemodel/internal/JClassContainer.java | 2 +- .../sun/codemodel/internal/JCodeModel.java | 4 +- .../sun/codemodel/internal/JConditional.java | 2 +- .../sun/codemodel/internal/JExpression.java | 2 +- .../codemodel/internal/JExpressionImpl.java | 2 +- .../com/sun/codemodel/internal/JOp.java | 2 +- .../codemodel/internal/JPrimitiveType.java | 2 +- .../com/sun/codemodel/internal/JType.java | 5 +- .../tools/ParallelWorldClassLoader.java | 16 +- .../tools/internal/jxc/SchemaGenerator.java | 4 +- .../jxc/gen/config/NGCCInterleaveFilter.java | 4 +- .../internal/jxc/gen/config/NGCCRuntime.java | 18 +- .../com/sun/tools/internal/xjc/Options.java | 10 +- .../tools/internal/xjc/api/JavaCompiler.java | 4 +- .../tools/internal/xjc/api/S2JJAXBModel.java | 2 +- .../internal/xjc/api/SchemaCompiler.java | 4 +- .../internal/xjc/model/CPropertyInfo.java | 4 +- .../sun/tools/internal/xjc/model/TypeUse.java | 2 +- .../internal/xjc/outline/FieldAccessor.java | 2 +- .../internal/xjc/reader/gbind/Expression.java | 4 +- .../ContentHandlerNamespacePrefixAdapter.java | 4 +- .../internalizer/SCDBasedBindingSet.java | 4 +- .../xjc/reader/xmlschema/ClassSelector.java | 4 +- .../reader/xmlschema/GWildcardElement.java | 2 +- .../xmlschema/UnusedCustomizationChecker.java | 3 +- .../xmlschema/bindinfo/BIFactoryMethod.java | 2 +- .../xmlschema/bindinfo/BIGlobalBinding.java | 4 +- .../xjc/runtime/ZeroOneBooleanAdapter.java | 2 +- .../rngom/ast/builder/SchemaBuilder.java | 14 +- .../rngom/ast/util/CheckingSchemaBuilder.java | 2 +- .../xml/internal/rngom/binary/package.html | 2 +- .../sun/xml/internal/rngom/nc/package.html | 2 +- .../internal/rngom/parse/host/package.html | 2 +- .../sun/xml/internal/xsom/XSAnnotation.java | 2 +- .../sun/xml/internal/xsom/XSComponent.java | 2 +- .../sun/xml/internal/xsom/XSElementDecl.java | 2 +- .../com/sun/xml/internal/xsom/XSType.java | 8 +- .../parser/state/NGCCInterleaveFilter.java | 4 +- .../xsom/impl/parser/state/NGCCRuntime.java | 18 +- .../internal/xsom/parser/SchemaDocument.java | 4 +- .../helpers/ParameterlessDatatypeBuilder.java | 4 +- .../helpers/StreamingValidatorImpl.java | 4 +- .../tools/internal/ws/api/WsgenExtension.java | 2 +- 188 files changed, 882 insertions(+), 863 deletions(-) diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java index dfdad263440..554e95db842 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java @@ -55,7 +55,7 @@ public interface CycleRecoverable { * * * @return - * the object to be marshalled instead of this object. + * the object to be marshalled instead of {@code this} object. * Or return null to indicate that the JAXB RI should behave * just like when your object does not implement {@link CycleRecoverable} * (IOW, cut the cycle arbitrarily and try to go on.) diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java index e95153aed31..ea8710d983b 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/IDResolver.java @@ -134,10 +134,10 @@ public abstract class IDResolver { * and it is used as the target object. * *

- * When a forward-reference happens, the call method + * When a forward-reference happens, the {@code call} method * should return null. In this case the JAXB RI unmarshaller invokes - * the call method again after all the documents are fully unmarshalled. - * If the call method still returns null, then the JAXB RI unmarshaller + * the {@code call} method again after all the documents are fully unmarshalled. + * If the {@code call} method still returns null, then the JAXB RI unmarshaller * treats it as an error. * *

diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java index 816d0d8d498..62aa63ef638 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java @@ -58,9 +58,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * marshaller.marshal(new Foo()); * * and you get: - * 


+ * <pre>{@code
  * <foo><x>0</x></foo>
- *
+ * } * *

* By creating a side boolean field/property that has this annotation, @@ -81,14 +81,14 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * marshaller.marshal(f); * - *

+ * {@code * <foo/> - * + * } * * f.xIsPresent = true; - * + * {@code * <foo><x>5</x></foo> - * + * } * * *

diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java index ad90df42a4b..6281847e713 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java @@ -60,7 +60,7 @@ import com.sun.istack.internal.Nullable; *

* When an {@link Unmarshaller} encounters (i) an unknown root element or (ii) unknown * elements where unmarshaller is trying to unmarshal into {@link XmlAnyElement} with - * lax=true, unmarshaller calls {@link #resolveElementName(String, String)} + * {@code lax=true}, unmarshaller calls {@link #resolveElementName(String, String)} * method to see if the application may be able to supply a class that corresponds * to that class. * diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java index 5f8372a8e91..9abfb067f0b 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java @@ -352,7 +352,7 @@ public abstract class JAXBRIContext extends JAXBContext { * Accordingly, this method may return an identifier that collides with reserved words. * *

- * Use JJavaName.isJavaIdentifier(String) to check for such collision. + * Use {@code JJavaName.isJavaIdentifier(String)} to check for such collision. * * @return * Typically, this method returns "nameLikeThis". @@ -394,17 +394,17 @@ public abstract class JAXBRIContext extends JAXBContext { * *

* For example, given the following - * 


+     * <pre>{@code
      * interface Foo<T> extends List<List<T>> {}
      * interface Bar extends Foo<String> {}
-     *
+ * } * This method works like this: - * 

+     * <pre>{@code
      * getBaseClass( Bar, List ) = List<List<String>
      * getBaseClass( Bar, Foo  ) = Foo<String>
      * getBaseClass( Foo<? extends Number>, Collection ) = Collection<List<? extends Number>>
      * getBaseClass( ArrayList<? extends BigInteger>, List ) = List<? extends BigInteger>
-     *
+ * } * * @param type * The type that derives from {@code baseType} @@ -460,7 +460,7 @@ public abstract class JAXBRIContext extends JAXBContext { /** * The property that you can specify to {@link JAXBContext#newInstance} - * to allow unmarshaller to honor xsi:nil anywhere, even if they are + * to allow unmarshaller to honor {@code xsi:nil} anywhere, even if they are * not specifically allowed by the schema. * * Boolean diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java index a6144ebbd5a..4dcc7e129cf 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java @@ -125,7 +125,7 @@ public abstract class NamespacePrefixMapper { * they are necessary, only at where they are used. Because of this * lack of look-ahead, sometimes the marshaller produces a lot of * namespace declarations that look redundant to human eyes. For example, - * 

+     * <pre>{@code
      * <?xml version="1.0"?>
      * <root>
      *   <ns1:child xmlns:ns1="urn:foo"> ... </ns1:child>
@@ -133,7 +133,7 @@ public abstract class NamespacePrefixMapper {
      *   <ns3:child xmlns:ns3="urn:foo"> ... </ns3:child>
      *   ...
      * </root>
-     *
+ * } * *

* The JAXB RI 2.x mostly doesn't exhibit this behavior any more, @@ -152,7 +152,7 @@ public abstract class NamespacePrefixMapper { *

* For example, by returning new String[]{"urn:foo"}, * the marshaller will produce: - * 


+     * <pre>{@code
      * <?xml version="1.0"?>
      * <root xmlns:ns1="urn:foo">
      *   <ns1:child> ... </ns1:child>
@@ -160,7 +160,7 @@ public abstract class NamespacePrefixMapper {
      *   <ns1:child> ... </ns1:child>
      *   ...
      * </root>
-     *
+ * } *

* To control prefixes assigned to those namespace URIs, use the * {@link #getPreferredPrefix(String, String, boolean)} method. @@ -232,7 +232,7 @@ public abstract class NamespacePrefixMapper { * the receiver a conflicting binding information. * It's a responsibility of the caller to make sure that this doesn't happen * even if the ancestor elements look like: - * 


+     * <pre>{@code
      *   <foo:abc xmlns:foo="abc">
      *     <foo:abc xmlns:foo="def">
      *       <foo:abc xmlns:foo="abc">
@@ -240,7 +240,7 @@ public abstract class NamespacePrefixMapper {
      *       </foo:abc>
      *     </foo:abc>
      *   </foo:abc>
-     *
+ * } * * @return * always return a non-null (but possibly empty) array. The array stores diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java index bf92a04f2e2..5e7830ffc55 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java @@ -46,7 +46,7 @@ public class Adapter { /** * The type that the JAXB can handle natively. - * The Default parameter of XmlAdapter<Default,Custom>. + * The {@code Default} parameter of {@code XmlAdapter}. * * Always non-null. */ @@ -54,7 +54,7 @@ public class Adapter { /** * The type that is stored in memory. - * The Custom parameter of XmlAdapter<Default,Custom>. + * The {@code Custom} parameter of {@code XmlAdapter}. */ public final TypeT customType; diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java index 36608f5cc2a..eee97bfedee 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java @@ -143,8 +143,8 @@ public interface ClassInfo extends MaybeElement { * False if it't not. * *

- * In RELAX NG context, ordered properties mean <group> and - * unordered properties mean <interleave>. + * In RELAX NG context, ordered properties mean {@code } and + * unordered properties mean {@code }. */ boolean isOrdered(); diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java index c067776dd97..cf212e27f0c 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java @@ -56,9 +56,9 @@ public interface ElementPropertyInfo extends PropertyInfo { * @XmlElements({ * @XmlElement(name="a",type=String.class), * @XmlElement(name="b",type=Integer.class), - * }) - * List<Object> abc; - * + * }) {@code + * List abc; + * } *

* In this case this method returns a list of two {@link TypeRef}s. * @@ -107,7 +107,7 @@ public interface ElementPropertyInfo extends PropertyInfo { * If {@link #isCollection()}==false, this property is always false. * *

- * When this flag is true, getTypes().size()==1 always holds. + * When this flag is true, {@code getTypes().size()==1} always holds. */ boolean isValueList(); diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java index f93a15b6d71..5765137f6ec 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java @@ -32,7 +32,7 @@ import javax.xml.namespace.QName; /** * Property that maps to the following schema fragment. * - * 


+ * <pre>{@code
  * <xs:complexType>
  *   <xs:sequence>
  *     <xs:element name="entry" minOccurs="0" maxOccurs="unbounded">
@@ -45,7 +45,7 @@ import javax.xml.namespace.QName;
  *     </xs:element>
  *   </xs:sequence>
  * </xs:complexType>
- *
+ * } * *

* This property is used to represent a default binding of a {@link Map} property. diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java index 77b3248c559..4713ad606e7 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java @@ -153,7 +153,7 @@ public interface TypeInfoSet { * A map from namespace URI to the value of the location. * If the entry is missing, that means a schema should be generated for that namespace. * If the value is "", that means the schema location is implied - * (<xs:schema namespace="..."/> w/o schemaLocation.) + * ({@code } w/o schemaLocation.) */ Map getSchemaLocations(); diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java index 358847cfd12..e45f061aee6 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java @@ -35,7 +35,7 @@ import com.sun.xml.internal.bind.v2.model.nav.Navigator; import com.sun.xml.internal.bind.v2.model.annotation.Locatable; /** - * {@link TypeInfo} implementation for xs:anyType. + * {@link TypeInfo} implementation for {@code xs:anyType}. * * @author Kohsuke Kawaguchi */ diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java index d728d8600e8..c6c0915e642 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java @@ -119,7 +119,7 @@ class TypeInfoSetImpl implements TypeInfoSet { }; /** - * {@link TypeInfo} for xs:anyType. + * {@link TypeInfo} for {@code xs:anyType}. * * anyType is the only {@link TypeInfo} that works with an interface, * and accordingly it requires a lot of special casing. diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java index 484743358fb..3e3c24c0245 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java @@ -40,10 +40,10 @@ final class GenericArrayTypeImpl implements GenericArrayType { } /** - * Returns a Type object representing the component type + * Returns a {@code Type} object representing the component type * of this array. * - * @return a Type object representing the component type + * @return a {@code Type} object representing the component type * of this array * @since 1.5 */ diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java index b5ee5e65e2f..71f122dd8e1 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java @@ -70,17 +70,17 @@ public interface Navigator { * *

* For example, given the following - * 


+     * <pre>{@code
      * interface Foo<T> extends List<List<T>> {}
      * interface Bar extends Foo<String> {}
-     *
+ * } * This method works like this: - * 

-     * getBaseClass( Bar, List ) = List<List<String>
+     * <pre>{@code
+     * getBaseClass( Bar, List ) = List<List<String>>
      * getBaseClass( Bar, Foo  ) = Foo<String>
      * getBaseClass( Foo<? extends Number>, Collection ) = Collection<List<? extends Number>>
      * getBaseClass( ArrayList<? extends BigInteger>, List ) = List<? extends BigInteger>
-     *
+ * } * * @param type * The type that derives from {@code baseType} diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java index 7d86d087ffc..d798957fec4 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java @@ -418,7 +418,7 @@ import com.sun.xml.internal.bind.v2.runtime.Location; } /** - * Returns the {@link Type} object that represents {@code clazz<T1,T2,T3>}. + * Returns the {@link Type} object that represents {@code clazz}. */ public Type createParameterizedType(Class rawType, Type... arguments) { return new ParameterizedTypeImpl(rawType, arguments, null); diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java index 415fd82e88d..225543684c0 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java @@ -35,7 +35,7 @@ import com.sun.xml.internal.bind.v2.model.core.TypeInfo; */ public interface RuntimeArrayInfo extends ArrayInfo, RuntimeNonElement { /** - * Represents T[]. + * Represents {@code T[]}. * * The same as {@link TypeInfo#getType()} but at the runtime, an array * is guaranteed to have a {@link Class} representation, not just any {@link Type}. diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java index cff5f238b09..0f0f4ad82df 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java @@ -48,7 +48,7 @@ import org.w3c.dom.NodeList; import org.xml.sax.SAXException; /** - * {@link JaxBeanInfo} for handling xs:anyType. + * {@link JaxBeanInfo} for handling {@code xs:anyType}. * * @author Kohsuke Kawaguchi */ diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java index 323cd98db43..ca2fa20fcab 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java @@ -119,7 +119,7 @@ public class IllegalAnnotationException extends JAXBException { * annotation, in which case this method returns a list that * contains another list, which in turn contains the location * information that leads to the error location - * (IOW, [ [pos1,pos2,...,posN] ]) + * (IOW, {@code [ [pos1,pos2,...,posN] ]}) * *

* Sometimes, an error could occur because of two or more conflicting @@ -127,12 +127,12 @@ public class IllegalAnnotationException extends JAXBException { * that contains many lists, where each list contains * the location information that leads to each of the conflicting * annotations - * (IOW, [ [pos11,pos12,...,pos1N],[pos21,pos22,...,pos2M], ... ]) + * (IOW, {@code [ [pos11,pos12,...,pos1N],[pos21,pos22,...,pos2M], ... ]}) * *

* Yet some other time, the runtime can fail to provide any * error location, in which case this method returns an empty list. - * (IOW, []). We do try hard to make sure this won't happen, + * (IOW, {@code []}). We do try hard to make sure this won't happen, * so please let us know * if you see this behavior. * @@ -146,13 +146,13 @@ public class IllegalAnnotationException extends JAXBException { * to the first in the list, sort of like a stack trace. * *

- * For example, suppose you specify class Foo to {@link JAXBContext}, - * Foo derives from Bar, Bar has a field pea - * that points to Zot, Zot contains a gum + * For example, suppose you specify class {@code Foo} to {@link JAXBContext}, + * {@code Foo} derives from {@code Bar}, {@code Bar} has a field {@code pea} + * that points to {@code Zot}, {@code Zot} contains a {@code gum} * property, and this property has an errornous annotation. * Then when this exception is thrown, the list of {@link Location}s * will look something like - * [ "gum property", "Zot class", "pea property", "Bar class", "Foo class" ] + * {@code [ "gum property", "Zot class", "pea property", "Bar class", "Foo class" ]} * * * @return diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java index f7b1db6bee1..3c918598348 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java @@ -533,7 +533,7 @@ public final class JAXBContextImpl extends JAXBRIContext { * This method traverses the base classes of the given object. * * @return null - * if c isn't a JAXB-bound class and fatal==false. + * if {@code c} isn't a JAXB-bound class and {@code fatal==false}. */ public final JaxBeanInfo getBeanInfo(Object o) { // don't allow xs:anyType beanInfo to handle all the unbound objects @@ -577,7 +577,7 @@ public final class JAXBContextImpl extends JAXBRIContext { * This method doesn't look for base classes. * * @return null - * if c isn't a JAXB-bound class and fatal==false. + * if {@code c} isn't a JAXB-bound class and {@code fatal==false}. */ public final JaxBeanInfo getBeanInfo(Class clazz) { return (JaxBeanInfo)beanInfoMap.get(clazz); diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java index eaf696c4f29..447b279958d 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java @@ -68,7 +68,7 @@ import org.xml.sax.SAXException; *

* Typically, {@link JaxBeanInfo} implementations should be generated * by XJC/JXC. Those impl classes will register themselves to their - * master ObjectFactory class. + * master {@code ObjectFactory} class. * *

* The type parameter BeanT is the Java class of the bean that this represents. diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java index a1888438a7f..27e7eb0b966 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java @@ -378,7 +378,7 @@ public final class XMLSerializer extends Coordinator { * c.endElement(); * * - * will generate <foo>abc def<bar/>ghi</foo>. + * will generate {@code abc defghi}. */ public void text( String text, String fieldName ) throws SAXException, IOException, XMLStreamException { // If the assertion fails, it must be a bug of xjc. @@ -492,7 +492,7 @@ public final class XMLSerializer extends Coordinator { * When a cycle is found, this method tries to recover from it. * * @return - * the object that should be marshalled instead of the given obj, + * the object that should be marshalled instead of the given {@code obj}, * or null if the error is found and we need to avoid marshalling this object * to prevent infinite recursion. When this method returns null, the error * has already been reported. diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java index 264257832c6..3234b436d45 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java @@ -134,7 +134,7 @@ final class SingleMapNodeProperty extends PropertyImpl private Loader valueLoader; /** - * Handles <items> and </items>. + * Handles {@code } and {@code }. * * The target will be set to a {@link Map}. */ @@ -190,7 +190,7 @@ final class SingleMapNodeProperty extends PropertyImpl }; /** - * Handles <entry> and </entry>. + * Handles {@code } and {@code }. * * The target will be set to a {@link Map}. */ diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java index e005de2e538..7abf6a0e82e 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java @@ -87,7 +87,7 @@ public abstract class Accessor implements Receiver { * * @param context The {@link JAXBContextImpl} that owns the whole thing. * (See {@link RuntimeModelBuilder#context}.) - * @return At least the implementation can return this. + * @return At least the implementation can return {@code this}. */ public Accessor optimize(@Nullable JAXBContextImpl context) { return this; diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java index f3d6c8599a1..30ec7115a63 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java @@ -64,7 +64,7 @@ public abstract class Loader { * and when the parent designated this loader as the child loader. * *

- * The callee may change state.loader to designate another {@link Loader} + * The callee may change {@code state.loader} to designate another {@link Loader} * for the processing. It's the responsibility of the callee to forward the startElement * event in such a case. * diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java index 7ea6c931d22..eb649c9b126 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java @@ -58,9 +58,9 @@ final class MTOMDecorator implements XmlVisitor { * UGLY HACK: we need to ignore the whitespace that follows * the attached base64 image. * - * This happens twice; once before </xop:Include>, another - * after </xop:Include>. The spec guarantees that - * no valid pcdata can follow </xop:Include>. + * This happens twice; once before {@code }, another + * after {@code }. The spec guarantees that + * no valid pcdata can follow {@code }. */ private boolean followXop; diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java index cfd16e60340..29ed86ded7c 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java @@ -150,9 +150,9 @@ public final class UnmarshallingContext extends Coordinator * *

* This flag is unused when {@link #assoc}==null. - * If it's non-null, then true indicates + * If it's non-null, then {@code true} indicates * that we are doing in-place associative unmarshalling. - * If false, then we are doing associative unmarshalling + * If {@code false}, then we are doing associative unmarshalling * without object reuse. */ private boolean isInplaceMode; diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java index cd8b49f39d7..aaca16917f0 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java @@ -72,7 +72,7 @@ enum Form { } /** - * Writes the attribute on the generated <schema> element. + * Writes the attribute on the generated {@code } element. */ abstract void declare(String attName, Schema schema); diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java index 7633e1ce017..b292e450fa8 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java @@ -551,7 +551,7 @@ public final class XmlSchemaGenerator { /** * Process the given PropertyInfo looking for references to namespaces that * are foreign to the given namespace. Any foreign namespace references - * found are added to the given namespaces dependency list and an <import> + * found are added to the given namespaces dependency list and an {@code } * is generated for it. * * @param p the PropertyInfo @@ -1140,7 +1140,8 @@ public final class XmlSchemaGenerator { /** * Checks if we can collapse - * <element name='foo' type='t' /> to <element ref='foo' />. + * {@code } + * to {@code }. * * This is possible if we already have such declaration to begin with. */ diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java index c288fa84990..4b4499eb21a 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java @@ -135,12 +135,12 @@ public final class QNameMap { /** * Returns the value to which the specified keys are mapped in this QNameMap, - * or null if the map contains no mapping for this key. + * or {@code null} if the map contains no mapping for this key. * * @param nsUri the namespaceUri key whose associated value is to be returned. * @param localPart the localPart key whose associated value is to be returned. * @return the value to which this map maps the specified set of keya, or - * null if the map contains no mapping for this set of keys. + * {@code null} if the map contains no mapping for this set of keys. * @see #put(String,String, Object) */ public V get( String nsUri, String localPart ) { diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java index 5016dd2744b..40eb1b134f5 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java @@ -71,13 +71,14 @@ public class MIMEParsingException extends java.lang.RuntimeException { /** * Constructs a new WebServiceException with the specified cause - * and a detail message of (cause==null ? null : - * cause.toString()) (which typically contains the - * class and detail message of cause). + * and a detail message of + * {@code (cause==null ? null : cause.toString())} + * (which typically contains the + * class and detail message of {@code cause}). * * @param cause The cause which is saved for the later * retrieval throw by the getCause method. - * (A null value is permitted, and + * (A {@code null} value is permitted, and * indicates that the cause is nonexistent or * unknown.) */ diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java index ffcf8e4c3e2..24ec9c7b3a5 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java @@ -42,19 +42,19 @@ public interface NamespaceContextEx extends NamespaceContext, Iterable * This method enumerates all the active in-scope namespace bindings. * This does not include implicit bindings, such as - * "xml"->"http://www.w3.org/XML/1998/namespace" - * or ""->"" (the implicit default namespace URI.) + * {@code "xml"->"http://www.w3.org/XML/1998/namespace"} + * or {@code ""->""} (the implicit default namespace URI.) * *

* The returned iterator may not include the same prefix more than once. - * For example, the returned iterator may only contain f=ns2 + * For example, the returned iterator may only contain {@code f=ns2} * if the document is as follows and this method is used at the bar element. * - * 


+     * <pre>{@code
      * <foo xmlns:f='ns1'>
      *   <bar xmlns:f='ns2'>
      *     ...
-     *
+ * } * *

* The iteration may be done in no particular order. diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java index 594862181a2..0073c4ad71a 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java @@ -111,7 +111,7 @@ public interface XMLStreamReaderEx extends XMLStreamReader { // * if the parser is not pointing at characters infoset item. // * @throws XMLStreamException // * if the parser points to text but text is not base64-encoded text, - // * or if some other parsing error occurs (such as if the <xop:Include> + // * or if some other parsing error occurs (such as if the {@code } // * points to a non-existing attachment.) // * // *

diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java index 1af7cc16ed5..2db83461f7d 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/Document.java @@ -286,7 +286,7 @@ public final class Document { * by using {@link #activeNamespaces}. * * @return - * the buffer passed as the buf parameter. + * the buffer passed as the {@code buf} parameter. */ private StringBuilder fixPrefix(StringBuilder buf) { assert activeNamespaces!=null; diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java index 25f7da1858f..aea748431c4 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java @@ -45,7 +45,7 @@ public interface TypedXmlWriter { * Commits this element (and all its descendants) to the output. * *

- * Short for _commit(true). + * Short for {@code _commit(true)}. */ void commit(); diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java index 22e743b12f4..333b7469d37 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java @@ -37,12 +37,12 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * Specifies that the invocation of the method will produce an attribute. * *

- * The method signature has to match the form R foo(DT1,DT2,..) + * The method signature has to match the form {@code R foo(DT1,DT2,..)} * *

- * R is either void or the type to which the interface that declares + * R is either {@code void} or the type to which the interface that declares * this method is assignable. In the case of the latter, the method will return - * this object, allowing you to chain the multiple attribute method + * {@code this} object, allowing you to chain the multiple attribute method * invocations like {@link StringBuffer}. * *

diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java index 9dbd188f976..dc2829830ac 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java @@ -50,13 +50,13 @@ import static java.lang.annotation.ElementType.METHOD; * The method signature has to match one of the following patterns. * *

- *
Child writer: TW foo()
+ *
Child writer: {@code TW foo()}
*
TW must be an interface derived from {@link TypedXmlWriter}. * When this method is called, a new child element is started, - * and its content can be written by using the returned TW + * and its content can be written by using the returned {@code TW} * object. This child element will be ended when its _commit method * is called. - *
Leaf element: void foo(DT1,DT2,...)
+ *
Leaf element: {@code void foo(DT1,DT2,...)}
*
DTi must be datatype objects. * When this method is called, a new child element is started, * followed by the whitespace-separated text data from each of diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java index afe069e9a28..3f3df9cc827 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java @@ -34,12 +34,12 @@ import java.lang.annotation.Target; * Specifies that the invocation of the method will produce a text * *

- * The method signature has to match the form R foo(DT1,DT2,..) + * The method signature has to match the form {@code R foo(DT1,DT2,..)} * *

- * R is either void or the type to which the interface that declares + * R is either {@code void} or the type to which the interface that declares * this method is assignable. In the case of the latter, the method will return - * this object, allowing you to chain the multiple method + * {@code this} object, allowing you to chain the multiple method * invocations like {@link StringBuffer}. * *

diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java index b7eb179b7be..a1b7652066a 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java @@ -77,15 +77,15 @@ import java.util.Stack; * *

This code will produce the following document:

* - * 
- * <?xml version="1.0" standalone="yes"?>
+ * 
{@code
+ * 
  *
- * <Person>
- *   <name>Jane Smith</name>
- *   <date-of-birth>1965-05-23</date-of-birth>
- *   <citizenship>US</citizenship>
- * </Person>
- * 

+ * 
+ *   Jane Smith
+ *   1965-05-23
+ *   US
+ * 
+ * }
* *

This class inherits from {@link XMLWriter}, * and provides all of the same support for Namespaces.

diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java index fe1d274df36..0fc2aae35ad 100644 --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java @@ -93,11 +93,11 @@ import java.util.Map; * *

The resulting document will look like this:

* - * 
- * <?xml version="1.0" standalone="yes"?>
+ * 
{@code
+ * 
  *
- * <greeting>Hello, world!</greeting>
- * 

+ * Hello, world!
+ * }
* *

In fact, there is an even simpler convenience method, * dataElement, designed for writing elements that @@ -127,9 +127,9 @@ import java.util.Map; * *

you will end up with

* - * 
- * <item>1</item><item>3</item><item>3</item>
- *
+ * 
{@code
+ * 133
+ * }
* *

You need to invoke one of the characters methods * explicitly to add newlines or indentation. Alternatively, you @@ -156,11 +156,11 @@ import java.util.Map; * *

The resulting document will look like this:

* - * 
- * <?xml version="1.0" standalone="yes"?>
+ * 
{@code
+ * 
  *
- * <_NS1:foo xmlns:_NS1="http://www.foo.com/ns/"/>
- * 

+ * <_NS1:foo xmlns:_NS1="http://www.foo.com/ns/"/>
+ * }
* *

In many cases, document authors will prefer to choose their * own prefixes rather than using the (ugly) default names. The @@ -188,11 +188,11 @@ import java.util.Map; * *

The resulting document will look like this:

* - * 
- * <?xml version="1.0" standalone="yes"?>
+ * 
{@code
+ * 
  *
- * <foo:foo xmlns:foo="http://www.foo.com/ns/"/>
- * 

+ * 
+ * }
* *

The default Namespace simply uses an empty string as the prefix:

* @@ -205,28 +205,28 @@ import java.util.Map; * *

The resulting document will look like this:

* - * 
- * <?xml version="1.0" standalone="yes"?>
+ * 
{@code
+ * 
  *
- * <foo xmlns="http://www.foo.com/ns/"/>
- * 

+ * 
+ * }
* *

By default, the XML writer will not declare a Namespace until * it is actually used. Sometimes, this approach will create * a large number of Namespace declarations, as in the following * example:

* - * 
- * <xml version="1.0" standalone="yes"?>
+ * 
{@code
+ * 
  *
- * <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- *  <rdf:Description about="http://www.foo.com/ids/books/12345">
- *   <dc:title xmlns:dc="http://www.purl.org/dc/">A Dark Night</dc:title>
- *   <dc:creator xmlns:dc="http://www.purl.org/dc/">Jane Smith</dc:title>
- *   <dc:date xmlns:dc="http://www.purl.org/dc/">2000-09-09</dc:title>
- *  </rdf:Description>
- * </rdf:RDF>
- * 

+ * 
+ *  
+ *   A Dark Night
+ *   Jane Smith
+ *   2000-09-09
+ *  
+ * 
+ * }
* *

The "rdf" prefix is declared only once, because the RDF Namespace * is used by the root element and can be inherited by all of its @@ -243,18 +243,18 @@ import java.util.Map; * though it's not needed there, and can be inherited by its * descendants:

* - * 
- * <xml version="1.0" standalone="yes"?>
+ * 
{@code
+ * 
  *
- * <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ * 
- *  <rdf:Description about="http://www.foo.com/ids/books/12345">
- *   <dc:title>A Dark Night</dc:title>
- *   <dc:creator>Jane Smith</dc:title>
- *   <dc:date>2000-09-09</dc:title>
- *  </rdf:Description>
- * </rdf:RDF>
- * 

+ *  
+ *   A Dark Night
+ *   Jane Smith
+ *   2000-09-09
+ *  
+ * 
+ * }
* *

This approach is also useful for declaring Namespace prefixes * that be used by qualified names appearing in attribute values or @@ -388,7 +388,7 @@ public class XMLWriter extends XMLFilterImpl implements LexicalHandler /** * Set whether the writer should print out the XML declaration - * (<?xml version='1.0' ... ?>). + * ({@code }). *

* This option is set to true by default. */ diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Binder.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Binder.java index 70ec8ea8af0..b8d2ed5ac83 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Binder.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Binder.java @@ -95,10 +95,10 @@ public abstract class Binder { *

* This method throws {@link UnmarshalException} when the Binder's * {@link JAXBContext} does not have a mapping for the XML element name - * or the type, specifiable via @xsi:type, of xmlNode + * or the type, specifiable via {@code @xsi:type}, of {@code xmlNode} * to a JAXB mapped class. The method {@link #unmarshal(Object, Class)} * enables an application to specify the JAXB mapped class that - * the xmlNode should be mapped to. + * the {@code xmlNode} should be mapped to. * * @param xmlNode * the document/element to unmarshal XML data from. @@ -110,8 +110,8 @@ public abstract class Binder { * If any unexpected errors occur while unmarshalling * @throws UnmarshalException * If the {@link ValidationEventHandler ValidationEventHandler} - * returns false from its handleEvent method or the - * Binder is unable to perform the XML to Java + * returns false from its {@code handleEvent} method or the + * {@code Binder} is unable to perform the XML to Java * binding. * @throws IllegalArgumentException * If the node parameter is null @@ -119,7 +119,7 @@ public abstract class Binder { public abstract Object unmarshal( XmlNode xmlNode ) throws JAXBException; /** - * Unmarshal XML root element by provided declaredType + * Unmarshal XML root element by provided {@code declaredType} * to a JAXB object tree. * *

@@ -138,18 +138,18 @@ public abstract class Binder { * @param xmlNode * the document/element to unmarshal XML data from. * @param declaredType - * appropriate JAXB mapped class to hold node's XML data. + * appropriate JAXB mapped class to hold {@code node}'s XML data. * * @return * JAXB Element representation - * of node + * of {@code node} * * @throws JAXBException * If any unexpected errors occur while unmarshalling * @throws UnmarshalException * If the {@link ValidationEventHandler ValidationEventHandler} - * returns false from its handleEvent method or the - * Binder is unable to perform the XML to Java + * returns false from its {@code handleEvent} method or the + * {@code Binder} is unable to perform the XML to Java * binding. * @throws IllegalArgumentException * If any of the input parameters are null @@ -182,9 +182,9 @@ public abstract class Binder { * If any unexpected problem occurs during the marshalling. * @throws MarshalException * If the {@link ValidationEventHandler ValidationEventHandler} - * returns false from its handleEvent method or the - * Binder is unable to marshal jaxbObject (or any - * object reachable from jaxbObject). + * returns false from its {@code handleEvent} method or the + * {@code Binder} is unable to marshal {@code jaxbObject} (or any + * object reachable from {@code jaxbObject}). * * @throws IllegalArgumentException * If any of the method parameters are null @@ -343,9 +343,9 @@ public abstract class Binder { public abstract Schema getSchema(); /** - * Allow an application to register a ValidationEventHandler. + * Allow an application to register a {@code ValidationEventHandler}. *

- * The ValidationEventHandler will be called by the JAXB Provider + * The {@code ValidationEventHandler} will be called by the JAXB Provider * if any validation errors are encountered during calls to any of the * Binder unmarshal, marshal and update methods. * @@ -373,7 +373,7 @@ public abstract class Binder { /** * * Set the particular property in the underlying implementation of - * Binder. This method can only be used to set one of + * {@code Binder}. This method can only be used to set one of * the standard JAXB defined unmarshal/marshal properties * or a provider specific property for binder, unmarshal or marshal. * Attempting to set an undefined property will result in @@ -397,7 +397,7 @@ public abstract class Binder { /** * Get the particular property in the underlying implementation of - * Binder. This method can only + * {@code Binder}. This method can only * be used to get one of * the standard JAXB defined unmarshal/marshal properties * or a provider specific property for binder, unmarshal or marshal. diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java index 26c0e4e28ce..5955ff6a20b 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DataBindingException.java @@ -30,7 +30,7 @@ package javax.xml.bind; * *

* This exception differs from {@link JAXBException} in that - * this is an unchecked exception, while JAXBException + * this is an unchecked exception, while {@code JAXBException} * is a checked exception. * * @see JAXB diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java index a5c8e13dbc0..dafc99e02d4 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverter.java @@ -294,7 +294,7 @@ final public class DatatypeConverter { * Converts the string argument into a byte value. * *

- * String parameter lexicalXSDQname must conform to lexical value space specifed at + * String parameter {@code lexicalXSDQname} must conform to lexical value space specifed at * XML Schema Part 2:Datatypes specification:QNames * * @param lexicalXSDQName @@ -304,7 +304,7 @@ final public class DatatypeConverter { * @return * A QName value represented by the string argument. * @throws IllegalArgumentException if string parameter does not conform to XML Schema Part 2 specification or - * if namespace prefix of lexicalXSDQname is not bound to a URI in NamespaceContext nsc. + * if namespace prefix of {@code lexicalXSDQname} is not bound to a URI in NamespaceContext {@code nsc}. */ public static javax.xml.namespace.QName parseQName( String lexicalXSDQName, NamespaceContext nsc) { @@ -365,7 +365,7 @@ final public class DatatypeConverter { * of xsd:unsignedInt. * @return * A long value represented by the string argument. - * @throws NumberFormatException if string parameter can not be parsed into a long value. + * @throws NumberFormatException if string parameter can not be parsed into a {@code long} value. */ public static long parseUnsignedInt( String lexicalXSDUnsignedInt ) { if (theConverter == null) initConverter(); @@ -380,7 +380,7 @@ final public class DatatypeConverter { * representation of xsd:unsignedShort. * @return * An int value represented by the string argument. - * @throws NumberFormatException if string parameter can not be parsed into an int value. + * @throws NumberFormatException if string parameter can not be parsed into an {@code int} value. */ public static int parseUnsignedShort( String lexicalXSDUnsignedShort ) { if (theConverter == null) initConverter(); @@ -454,7 +454,7 @@ final public class DatatypeConverter { * A BigInteger value * @return * A string containing a lexical representation of xsd:integer - * @throws IllegalArgumentException val is null. + * @throws IllegalArgumentException {@code val} is null. */ public static String printInteger( java.math.BigInteger val ) { if (theConverter == null) initConverter(); @@ -507,7 +507,7 @@ final public class DatatypeConverter { * A BigDecimal value * @return * A string containing a lexical representation of xsd:decimal - * @throws IllegalArgumentException val is null. + * @throws IllegalArgumentException {@code val} is null. */ public static String printDecimal( java.math.BigDecimal val ) { if (theConverter == null) initConverter(); @@ -575,8 +575,8 @@ final public class DatatypeConverter { * A namespace context for interpreting a prefix within a QName. * @return * A string containing a lexical representation of QName - * @throws IllegalArgumentException if val is null or - * if nsc is non-null or nsc.getPrefix(nsprefixFromVal) is null. + * @throws IllegalArgumentException if {@code val} is null or + * if {@code nsc} is non-null or {@code nsc.getPrefix(nsprefixFromVal)} is null. */ public static String printQName( javax.xml.namespace.QName val, NamespaceContext nsc ) { @@ -591,7 +591,7 @@ final public class DatatypeConverter { * A Calendar value * @return * A string containing a lexical representation of xsd:dateTime - * @throws IllegalArgumentException if val is null. + * @throws IllegalArgumentException if {@code val} is null. */ public static String printDateTime( java.util.Calendar val ) { if (theConverter == null) initConverter(); @@ -605,7 +605,7 @@ final public class DatatypeConverter { * An array of bytes * @return * A string containing a lexical representation of xsd:base64Binary - * @throws IllegalArgumentException if val is null. + * @throws IllegalArgumentException if {@code val} is null. */ public static String printBase64Binary( byte[] val ) { if (theConverter == null) initConverter(); @@ -619,7 +619,7 @@ final public class DatatypeConverter { * An array of bytes * @return * A string containing a lexical representation of xsd:hexBinary - * @throws IllegalArgumentException if val is null. + * @throws IllegalArgumentException if {@code val} is null. */ public static String printHexBinary( byte[] val ) { if (theConverter == null) initConverter(); @@ -659,7 +659,7 @@ final public class DatatypeConverter { * A Calendar value * @return * A string containing a lexical representation of xsd:time - * @throws IllegalArgumentException if val is null. + * @throws IllegalArgumentException if {@code val} is null. */ public static String printTime( java.util.Calendar val ) { if (theConverter == null) initConverter(); @@ -673,7 +673,7 @@ final public class DatatypeConverter { * A Calendar value * @return * A string containing a lexical representation of xsd:date - * @throws IllegalArgumentException if val is null. + * @throws IllegalArgumentException if {@code val} is null. */ public static String printDate( java.util.Calendar val ) { if (theConverter == null) initConverter(); diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java index 80828f88e7b..02a13c0f8bd 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/DatatypeConverterInterface.java @@ -194,7 +194,7 @@ public interface DatatypeConverterInterface { * Converts the string argument into a QName value. * *

- * String parameter lexicalXSDQname must conform to lexical value space specifed at + * String parameter {@code lexicalXSDQname} must conform to lexical value space specifed at * XML Schema Part 2:Datatypes specification:QNames * * @param lexicalXSDQName @@ -204,7 +204,7 @@ public interface DatatypeConverterInterface { * @return * A QName value represented by the string argument. * @throws IllegalArgumentException if string parameter does not conform to XML Schema Part 2 specification or - * if namespace prefix of lexicalXSDQname is not bound to a URI in NamespaceContext nsc. + * if namespace prefix of {@code lexicalXSDQname} is not bound to a URI in NamespaceContext {@code nsc}. */ public javax.xml.namespace.QName parseQName( String lexicalXSDQName, javax.xml.namespace.NamespaceContext nsc); @@ -249,7 +249,7 @@ public interface DatatypeConverterInterface { * of xsd:unsignedInt. * @return * A long value represented by the string argument. - * @throws NumberFormatException if string parameter can not be parsed into a long value. + * @throws NumberFormatException if string parameter can not be parsed into a {@code long} value. */ public long parseUnsignedInt( String lexicalXSDUnsignedInt ); @@ -260,7 +260,7 @@ public interface DatatypeConverterInterface { * representation of xsd:unsignedShort. * @return * An int value represented by the string argument. - * @throws NumberFormatException if string parameter can not be parsed into an int value. + * @throws NumberFormatException if string parameter can not be parsed into an {@code int} value. */ public int parseUnsignedShort( String lexicalXSDUnsignedShort ); @@ -313,7 +313,7 @@ public interface DatatypeConverterInterface { * A BigInteger value * @return * A string containing a lexical representation of xsd:integer - * @throws IllegalArgumentException val is null. + * @throws IllegalArgumentException {@code val} is null. */ public String printInteger( java.math.BigInteger val ); @@ -351,7 +351,7 @@ public interface DatatypeConverterInterface { * A BigDecimal value * @return * A string containing a lexical representation of xsd:decimal - * @throws IllegalArgumentException val is null. + * @throws IllegalArgumentException {@code val} is null. */ public String printDecimal( java.math.BigDecimal val ); @@ -399,8 +399,8 @@ public interface DatatypeConverterInterface { * A namespace context for interpreting a prefix within a QName. * @return * A string containing a lexical representation of QName - * @throws IllegalArgumentException if val is null or - * if nsc is non-null or nsc.getPrefix(nsprefixFromVal) is null. + * @throws IllegalArgumentException if {@code val} is null or + * if {@code nsc} is non-null or {@code nsc.getPrefix(nsprefixFromVal)} is null. */ public String printQName( javax.xml.namespace.QName val, javax.xml.namespace.NamespaceContext nsc ); @@ -411,7 +411,7 @@ public interface DatatypeConverterInterface { * A Calendar value * @return * A string containing a lexical representation of xsd:dateTime - * @throws IllegalArgumentException if val is null. + * @throws IllegalArgumentException if {@code val} is null. */ public String printDateTime( java.util.Calendar val ); @@ -421,7 +421,7 @@ public interface DatatypeConverterInterface { * an array of bytes * @return * A string containing a lexical representation of xsd:base64Binary - * @throws IllegalArgumentException if val is null. + * @throws IllegalArgumentException if {@code val} is null. */ public String printBase64Binary( byte[] val ); @@ -431,7 +431,7 @@ public interface DatatypeConverterInterface { * an array of bytes * @return * A string containing a lexical representation of xsd:hexBinary - * @throws IllegalArgumentException if val is null. + * @throws IllegalArgumentException if {@code val} is null. */ public String printHexBinary( byte[] val ); @@ -459,7 +459,7 @@ public interface DatatypeConverterInterface { * A Calendar value * @return * A string containing a lexical representation of xsd:time - * @throws IllegalArgumentException if val is null. + * @throws IllegalArgumentException if {@code val} is null. */ public String printTime( java.util.Calendar val ); @@ -469,7 +469,7 @@ public interface DatatypeConverterInterface { * A Calendar value * @return * A string containing a lexical representation of xsd:date - * @throws IllegalArgumentException if val is null. + * @throws IllegalArgumentException if {@code val} is null. */ public String printDate( java.util.Calendar val ); diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java index b6a16de0d18..d0f333bb919 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXB.java @@ -68,7 +68,7 @@ import java.net.URLConnection; * * *

- * In addition, the unmarshal methods have the following characteristic: + * In addition, the {@code unmarshal} methods have the following characteristic: * *

    *
  1. Schema validation is not performed on the input XML. @@ -78,7 +78,7 @@ import java.net.URLConnection; *
* *

- * Similarly, the marshal methods have the following characteristic: + * Similarly, the {@code marshal} methods have the following characteristic: *

    *
  1. The processing will try to continue even if the Java object tree * does not meet the validity requirement. Only as @@ -88,7 +88,7 @@ import java.net.URLConnection; * *

    * All the methods on this class require non-null arguments to all parameters. - * The unmarshal methods either fail with an exception or return + * The {@code unmarshal} methods either fail with an exception or return * a non-null value. * * @author Kohsuke Kawaguchi @@ -179,7 +179,7 @@ public final class JAXB { * * @param xml * The URI is {@link URI#toURL() turned into URL} and then - * follows the handling of URL. + * follows the handling of {@code URL}. */ public static T unmarshal( URI xml, Class type ) { try { @@ -196,9 +196,9 @@ public final class JAXB { * Reads in a Java object tree from the given XML input. * * @param xml - * The string is first interpreted as an absolute URI. + * The string is first interpreted as an absolute {@code URI}. * If it's not {@link URI#isAbsolute() a valid absolute URI}, - * then it's interpreted as a File + * then it's interpreted as a {@code File} */ public static T unmarshal( String xml, Class type ) { try { @@ -347,8 +347,8 @@ public final class JAXB { * * @param xml * The XML will be {@link URLConnection#getOutputStream() sent} to the - * resource pointed by this URL. Note that not all URLs support - * such operation, and exact semantics depends on the URL + * resource pointed by this URL. Note that not all {@code URL}s support + * such operation, and exact semantics depends on the {@code URL} * implementations. In case of {@link HttpURLConnection HTTP URLs}, * this will perform HTTP POST. * @@ -374,7 +374,7 @@ public final class JAXB { * * @param xml * The URI is {@link URI#toURL() turned into URL} and then - * follows the handling of URL. See above. + * follows the handling of {@code URL}. See above. * * @throws DataBindingException * If the operation fails, such as due to I/O error, unbindable classes. @@ -397,9 +397,9 @@ public final class JAXB { * This parameter must not be null. * * @param xml - * The string is first interpreted as an absolute URI. + * The string is first interpreted as an absolute {@code URI}. * If it's not {@link URI#isAbsolute() a valid absolute URI}, - * then it's interpreted as a File + * then it's interpreted as a {@code File} * * @throws DataBindingException * If the operation fails, such as due to I/O error, unbindable classes. @@ -522,19 +522,19 @@ public final class JAXB { * * {@link URL} * The XML will be {@link URLConnection#getOutputStream() sent} to the - * resource pointed by this URL. Note that not all URLs support - * such operation, and exact semantics depends on the URL + * resource pointed by this URL. Note that not all {@code URL}s support + * such operation, and exact semantics depends on the {@code URL} * implementations. In case of {@link HttpURLConnection HTTP URLs}, * this will perform HTTP POST. * * {@link URI} * The URI is {@link URI#toURL() turned into URL} and then - * follows the handling of URL. See above. + * follows the handling of {@code URL}. See above. * * {@link String} - * The string is first interpreted as an absolute URI. + * The string is first interpreted as an absolute {@code URI}. * If it's not {@link URI#isAbsolute() a valid absolute URI}, - * then it's interpreted as a File + * then it's interpreted as a {@code File} * * {@link OutputStream} * The XML will be sent to the given {@link OutputStream}. diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java index 9353f37ad3c..1835f77eb3f 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java @@ -38,7 +38,7 @@ public interface JAXBContextFactory { /** *

    - * Create a new instance of a JAXBContext class. + * Create a new instance of a {@code JAXBContext} class. * *

    * For semantics see {@link javax.xml.bind.JAXBContext#newInstance(Class[], java.util.Map)} @@ -52,11 +52,11 @@ public interface JAXBContextFactory { * in an empty map. * * @return - * A new instance of a JAXBContext. + * A new instance of a {@code JAXBContext}. * * @throws JAXBException * if an error was encountered while creating the - * JAXBContext, such as (but not limited to): + * {@code JAXBContext}, such as (but not limited to): *

      *
    1. Classes use JAXB annotations incorrectly *
    2. Classes have colliding annotations (i.e., two classes with the same type name) @@ -75,14 +75,14 @@ public interface JAXBContextFactory { /** *

      - * Create a new instance of a JAXBContext class. + * Create a new instance of a {@code JAXBContext} class. * *

      * For semantics see {@link javax.xml.bind.JAXBContext#newInstance(String, ClassLoader, java.util.Map)} * *

      * The interpretation of properties is up to implementations. Implementations should - * throw JAXBException if it finds properties that it doesn't understand. + * throw {@code JAXBException} if it finds properties that it doesn't understand. * * @param contextPath list of java package names that contain schema derived classes * @param classLoader @@ -91,9 +91,9 @@ public interface JAXBContextFactory { * provider-specific properties. Can be null, which means the same thing as passing * in an empty map. * - * @return a new instance of a JAXBContext + * @return a new instance of a {@code JAXBContext} * @throws JAXBException if an error was encountered while creating the - * JAXBContext such as + * {@code JAXBContext} such as *

        *
      1. failure to locate either ObjectFactory.class or jaxb.index in the packages
        2. *
      2. an ambiguity among global elements contained in the contextPath
        3. diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java index bc0b5281d5a..454d7768686 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBElement.java @@ -35,25 +35,25 @@ import java.io.Serializable; * declaration within a schema and the element instance value within an xml document * with the following properties *
          - *
        • element's xml tag name
          • - *
        • value represents the element instance's atttribute(s) and content model
          • - *
        • element declaration's declaredType (xs:element @type attribute)
          • - *
        • scope of element declaration
          • - *
        • boolean nil property. (element instance's xsi:nil attribute)
          • + *
        • element's xml tag {@code name}
          • + *
        • {@code value} represents the element instance's atttribute(s) and content model
          • + *
        • element declaration's {@code declaredType} ({@code xs:element @type} attribute)
          • + *
        • {@code scope} of element declaration
          • + *
        • boolean {@code nil} property. (element instance's {@code xsi:nil} attribute)
          • *
        * - *

        The declaredType and scope property are the + *

        The {@code declaredType} and {@code scope} property are the * JAXB class binding for the xml type definition. *

        * - *

        Scope is either {@link GlobalScope} or the Java class representing the + *

        {@code Scope} is either {@link GlobalScope} or the Java class representing the * complex type definition containing the schema element declaration. *

        * - *

        There is a property constraint that if value is null, - * then nil must be true. The converse is not true to enable - * representing a nil element with attribute(s). If nil is true, it is possible - * that value is non-null so it can hold the value of the attributes + *

        There is a property constraint that if {@code value} is {@code null}, + * then {@code nil} must be {@code true}. The converse is not true to enable + * representing a nil element with attribute(s). If {@code nil} is true, it is possible + * that {@code value} is non-null so it can hold the value of the attributes * associated with a nil element. *

        * @@ -97,7 +97,7 @@ public class JAXBElement implements Serializable { * @param declaredType Java binding of xml element declaration's type * @param scope * Java binding of scope of xml element declaration. - * Passing null is the same as passing GlobalScope.class + * Passing null is the same as passing {@code GlobalScope.class} * @param value * Java instance representing xml element's value. * @see #getScope() @@ -119,7 +119,7 @@ public class JAXBElement implements Serializable { /** * Construct an xml element instance. * - * This is just a convenience method for new JAXBElement(name,declaredType,GlobalScope.class,value) + * This is just a convenience method for {@code new JAXBElement(name,declaredType,GlobalScope.class,value)} */ public JAXBElement(QName name, Class declaredType, T value ) { this(name,declaredType,GlobalScope.class,value); @@ -142,7 +142,7 @@ public class JAXBElement implements Serializable { /** *

        Set the content model and attributes of this xml element.

        * - *

        When this property is set to null, isNil() must by true. + *

        When this property is set to {@code null}, {@code isNil()} must by {@code true}. * Details of constraint are described at {@link #isNil()}.

        * * @see #isTypeSubstituted() @@ -155,7 +155,7 @@ public class JAXBElement implements Serializable { *

        Return the content model and attribute values for this element.

        * *

        See {@link #isNil()} for a description of a property constraint when - * this value is null

        + * this value is {@code null}

        */ public T getValue() { return value; @@ -165,18 +165,18 @@ public class JAXBElement implements Serializable { * Returns scope of xml element declaration. * * @see #isGlobalScope() - * @return GlobalScope.class if this element is of global scope. + * @return {@code GlobalScope.class} if this element is of global scope. */ public Class getScope() { return scope; } /** - *

        Returns true iff this element instance content model + *

        Returns {@code true} iff this element instance content model * is nil.

        * - *

        This property always returns true when {@link #getValue()} is null. - * Note that the converse is not true, when this property is true, + *

        This property always returns {@code true} when {@link #getValue()} is null. + * Note that the converse is not true, when this property is {@code true}, * {@link #getValue()} can contain a non-null value for attribute(s). It is * valid for a nil xml element to have attribute(s).

        */ diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java index 7686dfbe671..e64c4655f03 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBException.java @@ -160,7 +160,7 @@ public class JAXBException extends Exception { /** * Prints this JAXBException and its stack trace (including the stack trace - * of the linkedException if it is non-null) to System.err. + * of the linkedException if it is non-null) to {@code System.err}. * */ public void printStackTrace() { diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java index 36e23b9a038..d3cfbb9547f 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBIntrospector.java @@ -74,7 +74,7 @@ public abstract class JAXBIntrospector { * *

        Convenience method to abstract whether working with either * a javax.xml.bind.JAXBElement instance or an instance of - * @XmlRootElement annotated Java class.

        + * {@code @XmlRootElement} annotated Java class.

        * * @param jaxbElement object that #isElement(Object) returns true. * diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java index e1f2cad20b8..24788a1e5c9 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/MarshalException.java @@ -30,7 +30,7 @@ package javax.xml.bind; * a marshal operation that the provider is unable to recover from. * *

        - * The ValidationEventHandler can cause this exception to be thrown + * The {@code ValidationEventHandler} can cause this exception to be thrown * during the marshal operations. See * {@link ValidationEventHandler#handleEvent(ValidationEvent) * ValidationEventHandler.handleEvent(ValidationEvent)}. 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 827425efd3a..4c0ca12cc22 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 @@ -33,7 +33,7 @@ import java.io.File; /** *

        - * The Marshaller class is responsible for governing the process + * The {@code Marshaller} class is responsible for governing the process * of serializing Java content trees back into XML data. It provides the basic * marshalling methods: * @@ -153,15 +153,15 @@ import java.io.File; * Marshalling content tree rooted by a JAXB element
        *

        * The first parameter of the overloaded - * Marshaller.marshal(java.lang.Object, ...) methods must be a + * {@code Marshaller.marshal(java.lang.Object, ...)} methods must be a * JAXB element as computed by * {@link JAXBIntrospector#isElement(java.lang.Object)}; - * otherwise, a Marshaller.marshal method must throw a + * otherwise, a {@code Marshaller.marshal} method must throw a * {@link MarshalException}. There exist two mechanisms * to enable marshalling an instance that is not a JAXB element. * One method is to wrap the instance as a value of a {@link JAXBElement}, * and pass the wrapper element as the first parameter to - * a Marshaller.marshal method. For java to schema binding, it + * a {@code Marshaller.marshal} method. For java to schema binding, it * is also possible to simply annotate the instance's class with * @{@link XmlRootElement}. *
        @@ -170,7 +170,7 @@ import java.io.File; * Encoding
        *
        * By default, the Marshaller will use UTF-8 encoding when generating XML data - * to a java.io.OutputStream, or a java.io.Writer. Use the + * to a {@code java.io.OutputStream}, or a {@code java.io.Writer}. Use the * {@link #setProperty(String,Object) setProperty} API to change the output * encoding used during these marshal operations. Client applications are * expected to supply a valid character encoding name as defined in the @@ -188,7 +188,7 @@ import java.io.File; * order to marshal it back into XML data. Different JAXB Providers will * support marshalling invalid Java content trees at varying levels, however * all JAXB Providers must be able to marshal a valid content tree back to - * XML data. A JAXB Provider must throw a MarshalException when it + * XML data. A JAXB Provider must throw a {@code MarshalException} when it * is unable to complete the marshal operation due to invalid content. Some * JAXB Providers will fully allow marshalling invalid content, others will fail * on the first validation error. @@ -213,18 +213,18 @@ import java.io.File; * All JAXB Providers are required to support the following set of properties. * Some providers may support additional properties. *
        - *
        jaxb.encoding - value must be a java.lang.String
        + *
        {@code jaxb.encoding} - value must be a java.lang.String
        *
        The output encoding to use when marshalling the XML data. The * Marshaller will use "UTF-8" by default if this property is not * specified.
        - *
        jaxb.formatted.output - value must be a java.lang.Boolean
        + *
        {@code jaxb.formatted.output} - value must be a java.lang.Boolean
        *
        This property controls whether or not the Marshaller will format * the resulting XML data with line breaks and indentation. A * true value for this property indicates human readable indented * xml data, while a false value indicates unformatted xml data. * The Marshaller will default to false (unformatted) if this * property is not specified.
        - *
        jaxb.schemaLocation - value must be a java.lang.String
        + *
        {@code jaxb.schemaLocation} - value must be a java.lang.String
        *
        This property allows the client application to specify an * xsi:schemaLocation attribute in the generated XML data. The format of * the schemaLocation attribute value is discussed in an easy to @@ -233,7 +233,7 @@ import java.io.File; * of the W3C XML Schema Part 0: Primer and specified in * * Section 2.6 of the W3C XML Schema Part 1: Structures.
        - *
        jaxb.noNamespaceSchemaLocation - value must be a java.lang.String
        + *
        {@code jaxb.noNamespaceSchemaLocation} - value must be a java.lang.String
        *
        This property allows the client application to specify an * xsi:noNamespaceSchemaLocation attribute in the generated XML * data. The format of the schemaLocation attribute value is discussed in @@ -242,10 +242,10 @@ import java.io.File; * of the W3C XML Schema Part 0: Primer and specified in * * Section 2.6 of the W3C XML Schema Part 1: Structures.
        - *
        jaxb.fragment - value must be a java.lang.Boolean
        + *
        {@code jaxb.fragment} - value must be a java.lang.Boolean
        *
        This property determines whether or not document level events will be * generated by the Marshaller. If the property is not specified, the - * default is false. This property has different implications depending + * default is {@code false}. This property has different implications depending * on which marshal api you are using - when this property is set to true:
        *
          *
        • {@link #marshal(Object,org.xml.sax.ContentHandler) marshal(Object,ContentHandler)} - the Marshaller won't @@ -352,15 +352,15 @@ public interface Marshaller { "jaxb.fragment"; /** - * Marshal the content tree rooted at jaxbElement into the specified - * javax.xml.transform.Result. + * Marshal the content tree rooted at {@code jaxbElement} into the specified + * {@code javax.xml.transform.Result}. * *

          * All JAXB Providers must at least support * {@link javax.xml.transform.dom.DOMResult}, * {@link javax.xml.transform.sax.SAXResult}, and * {@link javax.xml.transform.stream.StreamResult}. It can - * support other derived classes of Result as well. + * support other derived classes of {@code Result} as well. * * @param jaxbElement * The root of content tree to be marshalled. @@ -371,9 +371,9 @@ public interface Marshaller { * If any unexpected problem occurs during the marshalling. * @throws MarshalException * If the {@link ValidationEventHandler ValidationEventHandler} - * returns false from its handleEvent method or the - * Marshaller is unable to marshal obj (or any - * object reachable from obj). See + * returns false from its {@code handleEvent} method or the + * {@code Marshaller} is unable to marshal {@code obj} (or any + * object reachable from {@code obj}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -382,7 +382,7 @@ public interface Marshaller { throws JAXBException; /** - * Marshal the content tree rooted at jaxbElement into an output stream. + * Marshal the content tree rooted at {@code jaxbElement} into an output stream. * * @param jaxbElement * The root of content tree to be marshalled. @@ -393,9 +393,9 @@ public interface Marshaller { * If any unexpected problem occurs during the marshalling. * @throws MarshalException * If the {@link ValidationEventHandler ValidationEventHandler} - * returns false from its handleEvent method or the - * Marshaller is unable to marshal obj (or any - * object reachable from obj). See + * returns false from its {@code handleEvent} method or the + * {@code Marshaller} is unable to marshal {@code obj} (or any + * object reachable from {@code obj}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -404,7 +404,7 @@ public interface Marshaller { throws JAXBException; /** - * Marshal the content tree rooted at jaxbElement into a file. + * Marshal the content tree rooted at {@code jaxbElement} into a file. * * @param jaxbElement * The root of content tree to be marshalled. @@ -415,9 +415,9 @@ public interface Marshaller { * If any unexpected problem occurs during the marshalling. * @throws MarshalException * If the {@link ValidationEventHandler ValidationEventHandler} - * returns false from its handleEvent method or the - * Marshaller is unable to marshal obj (or any - * object reachable from obj). See + * returns false from its {@code handleEvent} method or the + * {@code Marshaller} is unable to marshal {@code obj} (or any + * object reachable from {@code obj}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -427,7 +427,7 @@ public interface Marshaller { throws JAXBException; /** - * Marshal the content tree rooted at jaxbElement into a Writer. + * Marshal the content tree rooted at {@code jaxbElement} into a Writer. * * @param jaxbElement * The root of content tree to be marshalled. @@ -438,9 +438,9 @@ public interface Marshaller { * If any unexpected problem occurs during the marshalling. * @throws MarshalException * If the {@link ValidationEventHandler ValidationEventHandler} - * returns false from its handleEvent method or the - * Marshaller is unable to marshal obj (or any - * object reachable from obj). See + * returns false from its {@code handleEvent} method or the + * {@code Marshaller} is unable to marshal {@code obj} (or any + * object reachable from {@code obj}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -449,7 +449,7 @@ public interface Marshaller { throws JAXBException; /** - * Marshal the content tree rooted at jaxbElement into SAX2 events. + * Marshal the content tree rooted at {@code jaxbElement} into SAX2 events. * * @param jaxbElement * The root of content tree to be marshalled. @@ -460,9 +460,9 @@ public interface Marshaller { * If any unexpected problem occurs during the marshalling. * @throws MarshalException * If the {@link ValidationEventHandler ValidationEventHandler} - * returns false from its handleEvent method or the - * Marshaller is unable to marshal obj (or any - * object reachable from obj). See + * returns false from its {@code handleEvent} method or the + * {@code Marshaller} is unable to marshal {@code obj} (or any + * object reachable from {@code obj}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -471,7 +471,7 @@ public interface Marshaller { throws JAXBException; /** - * Marshal the content tree rooted at jaxbElement into a DOM tree. + * Marshal the content tree rooted at {@code jaxbElement} into a DOM tree. * * @param jaxbElement * The content tree to be marshalled. @@ -486,9 +486,9 @@ public interface Marshaller { * If any unexpected problem occurs during the marshalling. * @throws MarshalException * If the {@link ValidationEventHandler ValidationEventHandler} - * returns false from its handleEvent method or the - * Marshaller is unable to marshal jaxbElement (or any - * object reachable from jaxbElement). See + * 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 * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -497,7 +497,7 @@ public interface Marshaller { throws JAXBException; /** - * Marshal the content tree rooted at jaxbElement into a + * Marshal the content tree rooted at {@code jaxbElement} into a * {@link javax.xml.stream.XMLStreamWriter}. * * @param jaxbElement @@ -509,9 +509,9 @@ public interface Marshaller { * If any unexpected problem occurs during the marshalling. * @throws MarshalException * If the {@link ValidationEventHandler ValidationEventHandler} - * returns false from its handleEvent method or the - * Marshaller is unable to marshal obj (or any - * object reachable from obj). See + * returns false from its {@code handleEvent} method or the + * {@code Marshaller} is unable to marshal {@code obj} (or any + * object reachable from {@code obj}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -521,7 +521,7 @@ public interface Marshaller { throws JAXBException; /** - * Marshal the content tree rooted at jaxbElement into a + * Marshal the content tree rooted at {@code jaxbElement} into a * {@link javax.xml.stream.XMLEventWriter}. * * @param jaxbElement @@ -533,9 +533,9 @@ public interface Marshaller { * If any unexpected problem occurs during the marshalling. * @throws MarshalException * If the {@link ValidationEventHandler ValidationEventHandler} - * returns false from its handleEvent method or the - * Marshaller is unable to marshal obj (or any - * object reachable from obj). See + * returns false from its {@code handleEvent} method or the + * {@code Marshaller} is unable to marshal {@code obj} (or any + * object reachable from {@code obj}). See * Marshalling a JAXB element. * @throws IllegalArgumentException * If any of the method parameters are null @@ -572,7 +572,7 @@ public interface Marshaller { /** * Set the particular property in the underlying implementation of - * Marshaller. This method can only be used to set one of + * {@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 @@ -593,7 +593,7 @@ public interface Marshaller { /** * Get the particular property in the underlying implementation of - * Marshaller. This method can only be used to get one of + * {@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 @@ -648,7 +648,7 @@ public interface Marshaller { * Associates a configured instance of {@link XmlAdapter} with this marshaller. * *

          - * This is a convenience method that invokes setAdapter(adapter.getClass(),adapter);. + * This is a convenience method that invokes {@code setAdapter(adapter.getClass(),adapter);}. * * @see #setAdapter(Class,XmlAdapter) * @throws IllegalArgumentException @@ -724,7 +724,7 @@ public interface Marshaller { * This method allows the caller to validate the marshalled XML as it's marshalled. * *

          - * Initially this property is set to null. + * Initially this property is set to {@code null}. * * @param schema Schema object to validate marshal operations against or null to disable validation * @throws UnsupportedOperationException could be thrown if this method is @@ -771,11 +771,11 @@ public interface Marshaller { public static abstract class Listener { /** *

          - * Callback method invoked before marshalling from source to XML. + * Callback method invoked before marshalling from {@code source} to XML. *

          *

          - * This method is invoked just before marshalling process starts to marshal source. - * Note that if the class of source defines its own beforeMarshal method, + * This method is invoked just before marshalling process starts to marshal {@code source}. + * Note that if the class of {@code source} defines its own {@code beforeMarshal} method, * the class specific callback method is invoked just before this method is invoked. * * @param source instance of JAXB mapped class prior to marshalling from it. @@ -785,11 +785,11 @@ public interface Marshaller { /** *

          - * Callback method invoked after marshalling source to XML. + * Callback method invoked after marshalling {@code source} to XML. *

          *

          - * This method is invoked after source and all its descendants have been marshalled. - * Note that if the class of source defines its own afterMarshal method, + * This method is invoked after {@code source} and all its descendants have been marshalled. + * Note that if the class of {@code source} defines its own {@code afterMarshal} method, * the class specific callback method is invoked just before this method is invoked. * * @param source instance of JAXB mapped class after marshalling it. @@ -804,7 +804,7 @@ public interface Marshaller { * *

          * There is only one Listener per Marshaller. Setting a Listener replaces the previous set Listener. - * One can unregister current Listener by setting listener to null. + * One can unregister current Listener by setting listener to {@code null}. * * @param listener an instance of a class that implements {@link Listener} * @since 1.6, JAXB 2.0 @@ -814,7 +814,8 @@ public interface Marshaller { /** *

          Return {@link Listener} registered with this {@link Marshaller}. * - * @return registered {@link Listener} or null if no Listener is registered with this Marshaller. + * @return registered {@link Listener} or {@code null} + * if no Listener is registered with this Marshaller. * @since 1.6, JAXB 2.0 */ public Listener getListener(); diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java index 1137443bcb5..4d3e859d57e 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/TypeConstraintException.java @@ -174,7 +174,7 @@ public class TypeConstraintException extends java.lang.RuntimeException { /** * Prints this TypeConstraintException and its stack trace (including the stack trace - * of the linkedException if it is non-null) to System.err. + * of the linkedException if it is non-null) to {@code System.err}. * */ public void printStackTrace() { diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java index 239675fce2b..9abe10600e8 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/UnmarshalException.java @@ -31,7 +31,7 @@ package javax.xml.bind; * the operation. * *

          - * The ValidationEventHandler can cause this exception to be thrown + * The {@code ValidationEventHandler} can cause this exception to be thrown * during the unmarshal operations. See * {@link ValidationEventHandler#handleEvent(ValidationEvent) * ValidationEventHandler.handleEvent(ValidationEvent)}. 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 fa183ad07b1..f075443bdfa 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 @@ -31,7 +31,7 @@ import javax.xml.validation.Schema; import java.io.Reader; /** - * The Unmarshaller class governs the process of deserializing XML + * The {@code Unmarshaller} class governs the process of deserializing XML * data into newly created Java content trees, optionally validating the XML * data as it is unmarshalled. It provides an overloading of unmarshal methods * for many different input kinds. @@ -71,7 +71,7 @@ import java.io.Reader; * *

          * Unmarshalling from a StringBuffer using a - * javax.xml.transform.stream.StreamSource: + * {@code javax.xml.transform.stream.StreamSource}: *

          * 
          {@code
  *       JAXBContext jc = JAXBContext.newInstance( "com.acme.foo" );
@@ -82,7 +82,7 @@ import java.io.Reader;
  *
          * *

          - * Unmarshalling from a org.w3c.dom.Node: + * Unmarshalling from a {@code org.w3c.dom.Node}: *

          * 
            *       JAXBContext jc = JAXBContext.newInstance( "com.acme.foo" );
@@ -98,7 +98,7 @@ import java.io.Reader;
  *
          * *

          - * Unmarshalling from a javax.xml.transform.sax.SAXSource using a + * Unmarshalling from a {@code javax.xml.transform.sax.SAXSource} using a * client specified validating SAX2.0 parser: *

          * 
          @@ -205,17 +205,17 @@ import java.io.Reader;
  * 
  * Unmarshal a root element that is globally declared
          
  * 
          
- * The unmarshal methods that do not have an declaredType parameter use
+ * The unmarshal methods that do not have an {@code declaredType} parameter use
  * {@link JAXBContext} to unmarshal the root element of an XML data. The {@link JAXBContext}
- * instance is the one that was used to create this Unmarshaller. The {@link JAXBContext}
+ * instance is the one that was used to create this {@code Unmarshaller}. The {@link JAXBContext}
  * instance maintains a mapping of globally declared XML element and type definition names to
  * JAXB mapped classes. The unmarshal method checks if {@link JAXBContext} has a mapping
- * from the root element's XML name and/or @xsi:type to a JAXB mapped class.  If it does, it umarshalls the
+ * from the root element's XML name and/or {@code @xsi:type} to a JAXB mapped class.  If it does, it umarshalls the
  * XML data using the appropriate JAXB mapped class. Note that when the root element name is unknown and the root
- * element has an @xsi:type, the XML data is unmarshalled
+ * element has an {@code @xsi:type}, the XML data is unmarshalled
  * using that JAXB mapped class as the value of a {@link JAXBElement}.
  * When the {@link JAXBContext} object does not have a mapping for the root element's name
- * nor its @xsi:type, if it exists,
+ * nor its {@code @xsi:type}, if it exists,
  * then the unmarshal operation will abort immediately by throwing a {@link UnmarshalException
  * UnmarshalException}. This exception scenario can be worked around by using the unmarshal by
  * declaredType methods described in the next subsection.
@@ -225,20 +225,20 @@ import java.io.Reader;
  * 
  * Unmarshal by Declared Type
          
  * 
          
- * The unmarshal methods with a declaredType parameter enable an
+ * The unmarshal methods with a {@code declaredType} parameter enable an
  * application to deserialize a root element of XML data, even when
  * there is no mapping in {@link JAXBContext} of the root element's XML name.
  * The unmarshaller unmarshals the root element using the application provided
- * mapping specified as the declaredType parameter.
+ * mapping specified as the {@code declaredType} parameter.
  * Note that even when the root element's element name is mapped by {@link JAXBContext},
- * the declaredType parameter overrides that mapping for
+ * the {@code declaredType} parameter overrides that mapping for
  * deserializing the root element when using these unmarshal methods.
- * Additionally, when the root element of XML data has an xsi:type attribute and
+ * Additionally, when the root element of XML data has an {@code xsi:type} attribute and
  * that attribute's value references a type definition that is mapped
  * to a JAXB mapped class by {@link JAXBContext}, that the root
- * element's xsi:type attribute takes
- * precedence over the unmarshal methods declaredType parameter.
- * These methods always return a {@literal JAXBElement}
+ * element's {@code xsi:type} attribute takes
+ * precedence over the unmarshal methods {@code declaredType} parameter.
+ * These methods always return a {@code JAXBElement}
  * instance. The table below shows how the properties of the returned JAXBElement
  * instance are set.
  *
@@ -255,21 +255,21 @@ import java.io.Reader;
  *     
  *     
  *       name
- *       xml element name
+ *       {@code xml element name}
  *     
  *   
  *   
  *     
  *       value
- *       instanceof declaredType
+ *       {@code instanceof declaredType}
  *     
  *     
  *       declaredType
- *       unmarshal method declaredType parameter
+ *       unmarshal method {@code declaredType} parameter
  *     
  *     
  *       scope
- *       null (actual scope is unknown)
+ *       {@code null} (actual scope is unknown)
  *     
  *   
  *  
@@ -279,7 +279,7 @@ import java.io.Reader;
  * The following is an example of
  * unmarshal by declaredType method.
  * 
          
- * Unmarshal by declaredType from a org.w3c.dom.Node:
+ * Unmarshal by declaredType from a {@code org.w3c.dom.Node}:
  * 
          
  *    
          {@code
  *       Schema fragment for example
@@ -330,7 +330,7 @@ import java.io.Reader;
  * 
          
  * 
          
  * A client application can enable or disable JAXP 1.3 validation
- * mechanism via the setSchema(javax.xml.validation.Schema) API.
+ * mechanism via the {@code setSchema(javax.xml.validation.Schema)} API.
  * Sophisticated clients can specify their own validating SAX 2.0 compliant
  * parser and bypass the JAXP 1.3 validation mechanism using the
  * {@link #unmarshal(javax.xml.transform.Source) unmarshal(Source)}  API.
@@ -421,8 +421,8 @@ public interface Unmarshaller {
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
      *      If the file parameter is null
@@ -444,8 +444,8 @@ public interface Unmarshaller {
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
      *      If the InputStream parameter is null
@@ -468,8 +468,8 @@ public interface Unmarshaller {
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
      *      If the InputStream parameter is null
@@ -491,8 +491,8 @@ public interface Unmarshaller {
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
      *      If the URL parameter is null
@@ -513,8 +513,8 @@ public interface Unmarshaller {
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
      *      If the InputSource parameter is null
@@ -537,8 +537,8 @@ public interface Unmarshaller {
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
      *      If the Node parameter is null
@@ -547,7 +547,7 @@ public interface Unmarshaller {
     public Object unmarshal( org.w3c.dom.Node node ) throws JAXBException;
 
     /**
-     * Unmarshal XML data by JAXB mapped declaredType
+     * Unmarshal XML data by JAXB mapped {@code declaredType}
      * and return the resulting content tree.
      *
      * 
          
@@ -557,16 +557,16 @@ public interface Unmarshaller {
      *      the document/element to unmarshal XML data from.
      *      The caller must support at least Document and Element.
      * @param declaredType
-     *      appropriate JAXB mapped class to hold node's XML data.
+     *      appropriate JAXB mapped class to hold {@code node}'s XML data.
      *
-     * @return JAXB Element representation of node
+     * @return JAXB Element representation of {@code node}
      *
      * @throws JAXBException
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
      *      If any parameter is null
@@ -588,30 +588,30 @@ public interface Unmarshaller {
      * A client application can choose not to use the default parser mechanism
      * supplied with their JAXB provider.  Any SAX 2.0 compliant parser can be
      * substituted for the JAXB provider's default mechanism.  To do so, the
-     * client application must properly configure a SAXSource containing
-     * an XMLReader implemented by the SAX 2.0 parser provider.  If the
-     * XMLReader has an org.xml.sax.ErrorHandler registered
+     * client application must properly configure a {@code SAXSource} containing
+     * an {@code XMLReader} implemented by the SAX 2.0 parser provider.  If the
+     * {@code XMLReader} has an {@code org.xml.sax.ErrorHandler} registered
      * on it, it will be replaced by the JAXB Provider so that validation errors
-     * can be reported via the ValidationEventHandler mechanism of
-     * JAXB.  If the SAXSource does not contain an XMLReader,
+     * can be reported via the {@code ValidationEventHandler} mechanism of
+     * JAXB.  If the {@code SAXSource} does not contain an {@code XMLReader},
      * then the JAXB provider's default parser mechanism will be used.
      * 
          
      * This parser replacement mechanism can also be used to replace the JAXB
      * provider's unmarshal-time validation engine.  The client application
      * must properly configure their SAX 2.0 compliant parser to perform
-     * validation (as shown in the example above).  Any SAXParserExceptions
-     *  encountered by the parser during the unmarshal operation will be
+     * validation (as shown in the example above).  Any {@code SAXParserExceptions}
+     * encountered by the parser during the unmarshal operation will be
      * processed by the JAXB provider and converted into JAXB
-     * ValidationEvent objects which will be reported back to the
-     * client via the ValidationEventHandler registered with the
-     * Unmarshaller.  Note: specifying a substitute validating
+     * {@code ValidationEvent} objects which will be reported back to the
+     * client via the {@code ValidationEventHandler} registered with the
+     * {@code Unmarshaller}.  Note: specifying a substitute validating
      * SAX 2.0 parser for unmarshalling does not necessarily replace the
      * validation engine used by the JAXB provider for performing on-demand
      * validation.
      * 
          
      * The only way for a client application to specify an alternate parser
      * mechanism to be used during unmarshal is via the
-     * unmarshal(SAXSource) API.  All other forms of the unmarshal
+     * {@code unmarshal(SAXSource)} API.  All other forms of the unmarshal
      * method (File, URL, Node, etc) will use the JAXB provider's default
      * parser and validator mechanisms.
      *
@@ -623,8 +623,8 @@ public interface Unmarshaller {
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
      *      If the Source parameter is null
@@ -635,7 +635,7 @@ public interface Unmarshaller {
 
 
     /**
-     * Unmarshal XML data from the specified XML Source by declaredType and return the
+     * Unmarshal XML data from the specified XML Source by {@code declaredType} and return the
      * resulting content tree.
      *
      * 
          
@@ -647,15 +647,15 @@ public interface Unmarshaller {
      * @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 source's xml root element
+     *      appropriate JAXB mapped class to hold {@code source}'s xml root element
      * @return Java content rooted by JAXB Element
      *
      * @throws JAXBException
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
      *      If any parameter is null
@@ -675,7 +675,7 @@ public interface Unmarshaller {
      * This method assumes that the parser is on a START_DOCUMENT or
      * START_ELEMENT event.  Unmarshalling will be done from this
      * start event to the corresponding end event.  If this method
-     * returns successfully, the reader will be pointing at
+     * returns successfully, the {@code reader} will be pointing at
      * the token right after the end event.
      *
      * @param reader
@@ -687,13 +687,13 @@ public interface Unmarshaller {
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
-     *      If the reader parameter is null
+     *      If the {@code reader} parameter is null
      * @throws IllegalStateException
-     *      If reader is not pointing to a START_DOCUMENT or
+     *      If {@code reader} is not pointing to a START_DOCUMENT or
      *      START_ELEMENT  event.
      * @since 1.6, JAXB 2.0
      * @see #unmarshal(javax.xml.stream.XMLStreamReader, Class)
@@ -702,7 +702,7 @@ public interface Unmarshaller {
         throws JAXBException;
 
     /**
-     * Unmarshal root element to JAXB mapped declaredType
+     * Unmarshal root element to JAXB mapped {@code declaredType}
      * and return the resulting content tree.
      *
      * 
          
@@ -711,13 +711,13 @@ public interface Unmarshaller {
      * This method assumes that the parser is on a START_DOCUMENT or
      * START_ELEMENT event. Unmarshalling will be done from this
      * start event to the corresponding end event.  If this method
-     * returns successfully, the reader will be pointing at
+     * returns successfully, the {@code reader} will be pointing at
      * the token right after the end event.
      *
      * @param reader
      *      The parser to be read.
      * @param declaredType
-     *      appropriate JAXB mapped class to hold reader's START_ELEMENT XML data.
+     *      appropriate JAXB mapped class to hold {@code reader}'s START_ELEMENT XML data.
      *
      * @return   content tree rooted by JAXB Element representation
      *
@@ -725,8 +725,8 @@ public interface Unmarshaller {
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
      *      If any parameter is null
@@ -745,7 +745,7 @@ public interface Unmarshaller {
      * This method assumes that the parser is on a START_DOCUMENT or
      * START_ELEMENT event.  Unmarshalling will be done from this
      * start event to the corresponding end event.  If this method
-     * returns successfully, the reader will be pointing at
+     * returns successfully, the {@code reader} will be pointing at
      * the token right after the end event.
      *
      * @param reader
@@ -757,13 +757,13 @@ public interface Unmarshaller {
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
-     *      If the reader parameter is null
+     *      If the {@code reader} parameter is null
      * @throws IllegalStateException
-     *      If reader is not pointing to a START_DOCUMENT or
+     *      If {@code reader} is not pointing to a START_DOCUMENT or
      *      START_ELEMENT event.
      * @since 1.6, JAXB 2.0
      * @see #unmarshal(javax.xml.stream.XMLEventReader, Class)
@@ -772,7 +772,7 @@ public interface Unmarshaller {
         throws JAXBException;
 
     /**
-     * Unmarshal root element to JAXB mapped declaredType
+     * Unmarshal root element to JAXB mapped {@code declaredType}
      * and return the resulting content tree.
      *
      * 
          
@@ -782,13 +782,13 @@ public interface Unmarshaller {
      * This method assumes that the parser is on a START_DOCUMENT or
      * START_ELEMENT event. Unmarshalling will be done from this
      * start event to the corresponding end event.  If this method
-     * returns successfully, the reader will be pointing at
+     * returns successfully, the {@code reader} will be pointing at
      * the token right after the end event.
      *
      * @param reader
      *      The parser to be read.
      * @param declaredType
-     *      appropriate JAXB mapped class to hold reader's START_ELEMENT XML data.
+     *      appropriate JAXB mapped class to hold {@code reader}'s START_ELEMENT XML data.
      *
      * @return   content tree rooted by JAXB Element representation
      *
@@ -796,8 +796,8 @@ public interface Unmarshaller {
      *     If any unexpected errors occur while unmarshalling
      * @throws UnmarshalException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Unmarshaller is unable to perform the XML to Java
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Unmarshaller} is unable to perform the XML to Java
      *     binding.  See Unmarshalling XML Data
      * @throws IllegalArgumentException
      *      If any parameter is null
@@ -812,9 +812,9 @@ public interface Unmarshaller {
      * 
          
      * The JAXB Provider can return the same handler object for multiple
      * invocations of this method. In other words, this method does not
-     * necessarily create a new instance of UnmarshallerHandler. If the
-     * application needs to use more than one UnmarshallerHandler, it
-     * should create more than one Unmarshaller.
+     * necessarily create a new instance of {@code UnmarshallerHandler}. If the
+     * application needs to use more than one {@code UnmarshallerHandler}, it
+     * should create more than one {@code Unmarshaller}.
      *
      * @return the unmarshaller handler object
      * @see UnmarshallerHandler
@@ -823,8 +823,8 @@ public interface Unmarshaller {
 
     /**
      * Specifies whether or not the default validation mechanism of the
-     * Unmarshaller should validate during unmarshal operations.
-     * By default, the Unmarshaller does not validate.
+     * {@code Unmarshaller} should validate during unmarshal operations.
+     * By default, the {@code Unmarshaller} does not validate.
      * 
          
      * This method may only be invoked before or after calling one of the
      * unmarshal methods.
@@ -852,7 +852,7 @@ public interface Unmarshaller {
         throws JAXBException;
 
     /**
-     * Indicates whether or not the Unmarshaller is configured to
+     * Indicates whether or not the {@code Unmarshaller} is configured to
      * validate during unmarshal operations.
      * 
          
      * This API returns the state of the JAXB Provider's default unmarshal-time
@@ -874,13 +874,13 @@ public interface Unmarshaller {
         throws JAXBException;
 
     /**
-     * Allow an application to register a ValidationEventHandler.
+     * Allow an application to register a {@code ValidationEventHandler}.
      * 
          
-     * The ValidationEventHandler will be called by the JAXB Provider
+     * The {@code ValidationEventHandler} will be called by the JAXB Provider
      * if any validation errors are encountered during calls to any of the
      * unmarshal methods.  If the client application does not register a
-     * ValidationEventHandler before invoking the unmarshal methods,
-     * then ValidationEvents will be handled by the default event
+     * {@code ValidationEventHandler} before invoking the unmarshal methods,
+     * then {@code ValidationEvents} will be handled by the default event
      * handler which will terminate the unmarshal operation after the first
      * error or fatal error is encountered.
      * 
          
@@ -908,7 +908,7 @@ public interface Unmarshaller {
 
     /**
      * Set the particular property in the underlying implementation of
-     * Unmarshaller.  This method can only be used to set one of
+     * {@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 
@@ -929,7 +929,7 @@ public interface Unmarshaller {
 
     /**
      * Get the particular property in the underlying implementation of
-     * Unmarshaller.  This method can only be used to get one of
+     * {@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 
@@ -955,7 +955,7 @@ public interface Unmarshaller {
      * API.
      *
      * 
          
-     * Initially this property is set to null.
+     * Initially this property is set to {@code null}.
      *
      * @param schema Schema object to validate unmarshal operations against or null to disable validation
      * @throws UnsupportedOperationException could be thrown if this method is
@@ -976,9 +976,9 @@ public interface Unmarshaller {
      * To determine if the Unmarshaller has validation enabled, simply
      * test the return type for null:
      * 
          
-     * 
+     * 
          {@code
      *   boolean isValidating = u.getSchema()!=null;
-     * 
+     * }
          
      *
      * @return the Schema object being used to perform unmarshal-time
      *      validation or null if not present
@@ -993,7 +993,7 @@ public interface Unmarshaller {
      * Associates a configured instance of {@link XmlAdapter} with this unmarshaller.
      *
      * 
          
-     * This is a convenience method that invokes setAdapter(adapter.getClass(),adapter);.
+     * This is a convenience method that invokes {@code setAdapter(adapter.getClass(),adapter);}.
      *
      * @see #setAdapter(Class,XmlAdapter)
      * @throws IllegalArgumentException
@@ -1084,34 +1084,35 @@ public interface Unmarshaller {
     public static abstract class Listener {
         /**
          * 
          
-         * Callback method invoked before unmarshalling into target.
+         * Callback method invoked before unmarshalling into {@code target}.
          * 
          
          * 
          
-         * This method is invoked immediately after target was created and
+         * This method is invoked immediately after {@code target} was created and
          * before the unmarshalling of this object begins. Note that
-         * if the class of target defines its own beforeUnmarshal method,
+         * if the class of {@code target} defines its own {@code beforeUnmarshal} method,
          * the class specific callback method is invoked before this method is invoked.
          *
          * @param target non-null instance of JAXB mapped class prior to unmarshalling into it.
-         * @param parent instance of JAXB mapped class that will eventually reference target.
-         *               null when target is root element.
+         * @param parent instance of JAXB mapped class that will eventually reference {@code target}.
+         *               {@code null} when {@code target} is root element.
          */
         public void beforeUnmarshal(Object target, Object parent) {
         }
 
         /**
          * 
          
-         * Callback method invoked after unmarshalling XML data into target.
+         * Callback method invoked after unmarshalling XML data into {@code target}.
          * 
          
          * 
          
-         * This method is invoked after all the properties (except IDREF) are unmarshalled into target,
-         * but before target is set into its parent object.
-         * Note that if the class of target defines its own afterUnmarshal method,
+         * This method is invoked after all the properties (except IDREF)
+         * are unmarshalled into {@code target},
+         * but before {@code target} is set into its {@code parent} object.
+         * Note that if the class of {@code target} defines its own {@code afterUnmarshal} method,
          * the class specific callback method is invoked before this method is invoked.
          *
          * @param target non-null instance of JAXB mapped class prior to unmarshalling into it.
-         * @param parent instance of JAXB mapped class that will reference target.
-         *               null when target is root element.
+         * @param parent instance of JAXB mapped class that will reference {@code target}.
+         *               {@code null} when {@code target} is root element.
          */
         public void afterUnmarshal(Object target, Object parent) {
         }
@@ -1123,7 +1124,7 @@ public interface Unmarshaller {
      *
      * 
          
      * There is only one Listener per Unmarshaller. Setting a Listener replaces the previous set Listener.
-     * One can unregister current Listener by setting listener to null.
+     * One can unregister current Listener by setting listener to {@code null}.
      *
      * @param listener  provides unmarshal event callbacks for this {@link Unmarshaller}
      * @since 1.6, JAXB 2.0
@@ -1133,7 +1134,8 @@ public interface Unmarshaller {
     /**
      * 
          Return {@link Listener} registered with this {@link Unmarshaller}.
      *
-     * @return registered {@link Listener} or null if no Listener is registered with this Unmarshaller.
+     * @return registered {@link Listener} or {@code null}
+     *         if no Listener is registered with this Unmarshaller.
      * @since 1.6, JAXB 2.0
      */
     public Listener getListener();
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java
index 9f21bf6c5e6..979cd435f36 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java
@@ -60,8 +60,8 @@ public interface ValidationEvent {
      * Retrieve the severity code for this warning/error.
      *
      * 
          
-     * Must be one of ValidationError.WARNING,
-     * ValidationError.ERROR, or ValidationError.FATAL_ERROR.
+     * Must be one of {@code ValidationError.WARNING},
+     * {@code ValidationError.ERROR}, or {@code ValidationError.FATAL_ERROR}.
      *
      * @return the severity code for this warning/error
      */
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java
index 1161fe89ba9..7b2847e4653 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventHandler.java
@@ -39,7 +39,7 @@ package javax.xml.bind;
  * handlers.
  *
  * 
          
- * If the handleEvent method throws an unchecked runtime exception,
+ * If the {@code handleEvent} method throws an unchecked runtime exception,
  * the JAXB Provider must treat that as if the method returned false, effectively
  * terminating whatever operation was in progress at the time (unmarshal,
  * validate, or marshal).
@@ -49,7 +49,7 @@ package javax.xml.bind;
  * by the specification and may result in unexpected behaviour.
  *
  * 
          
- * Failing to return false from the handleEvent method after
+ * Failing to return false from the {@code handleEvent} method after
  * encountering a fatal error is undefined by the specification and may result
  * in unexpected behavior.
  *
@@ -59,7 +59,9 @@ package javax.xml.bind;
  *    See: Validator javadocs
  * 
          
  *
- * @author 
          • Ryan Shoemaker, Sun Microsystems, Inc.
          • Kohsuke Kawaguchi, Sun Microsystems, Inc.
          • Joe Fialli, Sun Microsystems, Inc.
          
+ * @author 
          • Ryan Shoemaker, Sun Microsystems, Inc.
            • 
+ *             
          • Kohsuke Kawaguchi, Sun Microsystems, Inc.
            • 
+ *             
          • Joe Fialli, Sun Microsystems, Inc.
          
  * @see Unmarshaller
  * @see Validator
  * @see Marshaller
@@ -85,8 +87,8 @@ public interface ValidationEventHandler {
      * @return true if the JAXB Provider should attempt to continue the current
      *         unmarshal, validate, or marshal operation after handling this
      *         warning/error, false if the provider should terminate the current
-     *         operation with the appropriate UnmarshalException,
-     *         ValidationException, or MarshalException.
+     *         operation with the appropriate {@code UnmarshalException},
+     *         {@code ValidationException}, or {@code MarshalException}.
      * @throws IllegalArgumentException if the event object is null.
      */
     public boolean handleEvent( ValidationEvent event );
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java
index e9b325d0f63..dc3fd5c0218 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEventLocator.java
@@ -29,15 +29,17 @@ package javax.xml.bind;
  * Encapsulate the location of a ValidationEvent.
  *
  * 
          
- * The ValidationEventLocator indicates where the ValidationEvent
- *  occurred.  Different fields will be set depending on the type of
+ * The {@code ValidationEventLocator} indicates where the {@code ValidationEvent}
+ * occurred.  Different fields will be set depending on the type of
  * validation that was being performed when the error or warning was detected.
  * For example, on-demand validation would produce locators that contained
  * references to objects in the Java content tree while unmarshal-time
  * validation would produce locators containing information appropriate to the
  * source of the XML data (file, url, Node, etc).
  *
- * @author 
          • Ryan Shoemaker, Sun Microsystems, Inc.
          • Kohsuke Kawaguchi, Sun Microsystems, Inc.
          • Joe Fialli, Sun Microsystems, Inc.
          
+ * @author 
          • Ryan Shoemaker, Sun Microsystems, Inc.
            • 
+ *             
          • Kohsuke Kawaguchi, Sun Microsystems, Inc.
            • 
+ *             
          • Joe Fialli, Sun Microsystems, Inc.
          
  * @see Validator
  * @see ValidationEvent
  * @since 1.6, JAXB 1.0
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java
index b06feb7777e..6f66041e7b6 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationException.java
@@ -30,7 +30,7 @@ package javax.xml.bind;
  * a validate operation.
  *
  * 
          
- * The ValidationEventHandler can cause this exception to be thrown
+ * The {@code ValidationEventHandler} can cause this exception to be thrown
  * during the validate operations.  See
  * {@link ValidationEventHandler#handleEvent(ValidationEvent)
  * ValidationEventHandler.handleEvent(ValidationEvent)}.
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Validator.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Validator.java
index 18f7d6166c9..c926d60c178 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Validator.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Validator.java
@@ -28,7 +28,7 @@ package javax.xml.bind;
 /**
  * As of JAXB 2.0, this class is deprecated and optional.
  * 
          
- * The Validator class is responsible for controlling the validation
+ * The {@code Validator} class is responsible for controlling the validation
  * of content trees during runtime.
  *
  * 
          
@@ -69,19 +69,19 @@ package javax.xml.bind;
  * 
          
  *
  * 
          
- * The Validator class is responsible for managing On-Demand Validation.
- * The Unmarshaller class is responsible for managing Unmarshal-Time
+ * The {@code Validator} class is responsible for managing On-Demand Validation.
+ * The {@code Unmarshaller} class is responsible for managing Unmarshal-Time
  * Validation during the unmarshal operations.  Although there is no formal
  * method of enabling validation during the marshal operations, the
- * Marshaller may detect errors, which will be reported to the
- * ValidationEventHandler registered on it.
+ * {@code Marshaller} may detect errors, which will be reported to the
+ * {@code ValidationEventHandler} registered on it.
  *
  * 
          
  * 
  * Using the Default EventHandler
          
  * 
          
  *   If the client application does not set an event handler on their
- *   Validator, Unmarshaller, or Marshaller prior to
+ *   {@code Validator}, {@code Unmarshaller}, or {@code Marshaller} prior to
  *   calling the validate, unmarshal, or marshal methods, then a default event
  *   handler will receive notification of any errors or warnings encountered.
  *   The default event handler will cause the current operation to halt after
@@ -98,24 +98,24 @@ package javax.xml.bind;
  *    
          
  *        
          Use the default event handler
          
  *        
          The default event handler will be used if you do not specify one
- *            via the setEventHandler API's on Validator,
- *            Unmarshaller, or Marshaller.
+ *            via the {@code setEventHandler} API's on {@code Validator},
+ *            {@code Unmarshaller}, or {@code Marshaller}.
  *        
          
  *
  *        
          Implement and register a custom event handler
          
  *        
          Client applications that require sophisticated event processing
- *            can implement the ValidationEventHandler interface and
- *            register it with the Unmarshaller and/or
- *            Validator.
+ *            can implement the {@code ValidationEventHandler} interface and
+ *            register it with the {@code Unmarshaller} and/or
+ *            {@code Validator}.
  *        
          
  *
  *        
          Use the {@link javax.xml.bind.util.ValidationEventCollector ValidationEventCollector}
  *            utility
          
  *        
          For convenience, a specialized event handler is provided that
- *            simply collects any ValidationEvent objects created
+ *            simply collects any {@code ValidationEvent} objects created
  *            during the unmarshal, validate, and marshal operations and
  *            returns them to the client application as a
- *            java.util.Collection.
+ *            {@code java.util.Collection}.
  *        
          
  *    
          
  * 
          
@@ -131,9 +131,9 @@ package javax.xml.bind;
  * cases, the JAXB Provider will set the severity of the ValidationEvent to
  * FATAL_ERROR to indicate that the unmarshal, validate, or marshal operations
  * should be terminated.  The default event handler and
- * ValidationEventCollector utility class must terminate processing
+ * {@code ValidationEventCollector} utility class must terminate processing
  * after being notified of a fatal error.  Client applications that supply their
- * own ValidationEventHandler should also terminate processing after
+ * own {@code ValidationEventHandler} should also terminate processing after
  * being notified of a fatal error.  If not, unexpected behaviour may occur.
  * 
          
  *
@@ -195,7 +195,7 @@ public interface Validator {
         throws JAXBException;
 
     /**
-     * Validate the Java content tree starting at subrootObj.
+     * Validate the Java content tree starting at {@code subrootObj}.
      * 
          
      * Client applications can use this method to validate Java content trees
      * on-demand at runtime.  This method can be used to validate any arbitrary
@@ -206,19 +206,19 @@ public interface Validator {
      * @throws JAXBException if any unexpected problem occurs during validation
      * @throws ValidationException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Validator is unable to validate the content tree rooted
-     *     at subrootObj
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Validator} is unable to validate the content tree rooted
+     *     at {@code subrootObj}
      * @throws IllegalArgumentException
      *      If the subrootObj parameter is null
-     * @return true if the subtree rooted at subrootObj is valid, false
+     * @return true if the subtree rooted at {@code subrootObj} is valid, false
      *         otherwise
      * @deprecated since JAXB2.0
      */
     public boolean validate( Object subrootObj ) throws JAXBException;
 
     /**
-     * Validate the Java content tree rooted at rootObj.
+     * Validate the Java content tree rooted at {@code rootObj}.
      * 
          
      * Client applications can use this method to validate Java content trees
      * on-demand at runtime.  This method is used to validate an entire Java
@@ -229,12 +229,12 @@ public interface Validator {
      * @throws JAXBException if any unexpected problem occurs during validation
      * @throws ValidationException
      *     If the {@link ValidationEventHandler ValidationEventHandler}
-     *     returns false from its handleEvent method or the
-     *     Validator is unable to validate the content tree rooted
-     *     at rootObj
+     *     returns false from its {@code handleEvent} method or the
+     *     {@code Validator} is unable to validate the content tree rooted
+     *     at {@code rootObj}
      * @throws IllegalArgumentException
      *      If the rootObj parameter is null
-     * @return true if the tree rooted at rootObj is valid, false
+     * @return true if the tree rooted at {@code rootObj} is valid, false
      *         otherwise
      * @deprecated since JAXB2.0
      */
@@ -242,7 +242,7 @@ public interface Validator {
 
     /**
      * Set the particular property in the underlying implementation of
-     * Validator.  This method can only be used to set one of
+     * {@code Validator}.  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 
@@ -264,7 +264,7 @@ public interface Validator {
 
     /**
      * Get the particular property in the underlying implementation of
-     * Validator.  This method can only be used to get one of
+     * {@code Validator}.  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 
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java
index 483849c16e3..13e3cf957b3 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java
@@ -38,7 +38,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *
  * 
          Usage 
          
  *
- * 
            @XmlAccessorOrder  annotation can be used with the following
+ * 
           {@code @XmlAccessorOrder} annotation can be used with the following
  * program elements:
          
  *
  * 
            
@@ -46,19 +46,19 @@ import static java.lang.annotation.RetentionPolicy.*;
  *   
          •  a top level class 
            • 
  * 
          
  *
- * 
           See "Package Specification" in javax.xml.bind package javadoc for
+ * 
           See "Package Specification" in {@code javax.xml.bind} package javadoc for
  * additional common information.
          
  *
  * 
          The effective {@link XmlAccessOrder} on a class is determined
  * as follows:
  *
  * 
            
- *   
          •  If there is a @XmlAccessorOrder on a class, then
+ *   
          •  If there is a {@code @XmlAccessorOrder} on a class, then
  *        it is used. 
            • 
- *   
          •  Otherwise, if a @XmlAccessorOrder  exists on one of
+ *   
          •  Otherwise, if a {@code @XmlAccessorOrder} exists on one of
  *        its super classes, then it is inherited (by the virtue of
  *        {@link Inherited})
- *   
          •  Otherwise, the @XmlAccessorOrder on the package
+ *   
          •  Otherwise, the {@code @XmlAccessorOrder} on the package
  *        of the class is used, if it's there.
  *   
          •  Otherwise {@link XmlAccessOrder#UNDEFINED}.
  * 
          
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java
index a4e5525c151..d9194ce132c 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAccessorType.java
@@ -38,7 +38,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *
  * 
            Usage  
          
  *
- * 
           @XmlAccessorType annotation can be used with the following program elements:
          
+ * 
           {@code @XmlAccessorType} annotation can be used with the following program elements:
          
  *
  * 
            
  *   
          •  package
            • 
@@ -51,28 +51,28 @@ import static java.lang.annotation.RetentionPolicy.*;
  * 
            This annotation provides control over the default serialization
  * of properties and fields in a class.
  *
- * 
            The annotation  @XmlAccessorType  on a package applies to
+ * 
            The annotation {@code @XmlAccessorType} on a package applies to
  * all classes in the package. The following inheritance
  * semantics apply:
  *
  * 
              
- *   
            •  If there is a @XmlAccessorType on a class, then it
+ *   
            •  If there is a {@code @XmlAccessorType} on a class, then it
  *        is used. 
              • 
- *   
            •  Otherwise, if a @XmlAccessorType exists on one of
+ *   
            •  Otherwise, if a {@code @XmlAccessorType} exists on one of
  *        its super classes, then it is inherited.
- *   
            •  Otherwise, the @XmlAccessorType  on a package is
+ *   
            •  Otherwise, the {@code @XmlAccessorType} on a package is
  *        inherited.
  * 
            
  * 
              Defaulting Rules:  
            
  *
- * 
            By default, if @XmlAccessorType  on a package is absent,
+ * 
            By default, if {@code @XmlAccessorType} on a package is absent,
  * then the following package level annotation is assumed.
            
  * 
              *   @XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
  * 
            
- * 
             By default, if @XmlAccessorType on a class is absent,
+ * 
             By default, if {@code @XmlAccessorType} on a class is absent,
  * and none of its super classes is annotated with
- * @XmlAccessorType, then the following default on the class
+ * {@code @XmlAccessorType}, then the following default on the class
  * is assumed: 
            
  * 
              *   @XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java
index b237b80221b..beba1891347 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java
@@ -40,7 +40,7 @@ import static java.lang.annotation.ElementType.METHOD;
  *
  * 
             Usage 
            
  * 
            
- * The @XmlAnyAttribute annotation can be used with the
+ * The {@code @XmlAnyAttribute} annotation can be used with the
  * following program elements:
  * 
              
  *   
            •  JavaBean property 
              • 
@@ -53,8 +53,8 @@ import static java.lang.annotation.ElementType.METHOD;
  * The usage is subject to the following constraints:
  * 
                
  *   
              •  At most one field or property in a class can be annotated
- *        with @XmlAnyAttribute.  
                • 
- *   
              •  The type of the property or the field must java.util.Map 
                • 
+ *        with {@code @XmlAnyAttribute}.  
+ *   
              •  The type of the property or the field must {@code java.util.Map} 
                • 
  * 
              
  *
  * 
              
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java
index 713c5c0f5c0..8b418fff3af 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAttribute.java
@@ -37,7 +37,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *
  * 
               Usage 
              
  * 
              
- * The @XmlAttribute annotation can be used with the
+ * The {@code @XmlAttribute} annotation can be used with the
  * following program elements:
  * 
                
  *   
              •  JavaBean property 
                • 
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java
index aa752d31040..d9c52cf0a11 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElement.java
@@ -38,7 +38,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *
  * 
                 Usage
  * 
                
- * @XmlElement annotation can be used with the following program
+ * {@code @XmlElement} annotation can be used with the following program
  * elements:
  * 
                  
  *   
                •  a JavaBean property 
                  • 
@@ -62,7 +62,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *   
                •  if the type of JavaBean property is a collection type of
  *        array, an indexed property, or a parameterized list, and
  *        this annotation is used with {@link XmlElements} then,
- *        @XmlElement.type() must be DEFAULT.class since the
+ *        {@code @XmlElement.type()} must be DEFAULT.class since the
  *        collection item type is already known. 
                  • 
  * 
                
  *
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java
index 6d791e95c05..42532626b5e 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementDecl.java
@@ -170,19 +170,19 @@ public @interface XmlElementDecl {
      * namespace name of a substitution group's head XML element.
      * 
                
      * This specifies the namespace name of the XML element whose local
-     * name is specified by substitutionHeadName().
+     * name is specified by {@code substitutionHeadName()}.
      * 
                
-     * If susbtitutionHeadName() is "", then this
+     * If {@code susbtitutionHeadName()} is "", then this
      * value can only be "##default". But the value is ignored since
      * since this element is not part of susbtitution group when the
-     * value of susbstitutionHeadName() is "".
+     * value of {@code susbstitutionHeadName()} is "".
      * 
                
-     * If susbtitutionHeadName() is not "" and the value is
+     * If {@code susbtitutionHeadName()} is not "" and the value is
      * "##default", then the namespace name is the namespace name to
      * which the package of the containing class, marked with {@link
      * XmlRegistry }, is mapped.
      * 
                
-     * If susbtitutionHeadName() is not "" and the value is
+     * If {@code susbtitutionHeadName()} is not "" and the value is
      * not "##default", then the value is the namespace name.
      *
      * @see #substitutionHeadName()
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java
index b420d7b1414..c2c2ea992be 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementRef.java
@@ -39,7 +39,7 @@ import static java.lang.annotation.ElementType.METHOD;
  * 
                
  * Usage
  * 
                
- * @XmlElementRef annotation can be used with a
+ * {@code @XmlElementRef} annotation can be used with a
  * JavaBean property or from within {@link XmlElementRefs}
  * 
                
  * This annotation dynamically associates an XML element name with the JavaBean
@@ -62,9 +62,9 @@ import static java.lang.annotation.ElementType.METHOD;
  * }
            
  * 
            
  * An element factory method annotated with  {@link XmlElementDecl} is
- * used to create a JAXBElement instance, containing an XML
- * element name. The presence of @XmlElementRef annotation on an
- * element property indicates that the element name from JAXBElement
+ * used to create a {@code JAXBElement} instance, containing an XML
+ * element name. The presence of {@code @XmlElementRef} annotation on an
+ * element property indicates that the element name from {@code JAXBElement}
  * instance be used instead of deriving an XML element name from the
  * JavaBean property name.
  *
@@ -74,7 +74,7 @@ import static java.lang.annotation.ElementType.METHOD;
  *   
          •  If the collection item type (for collection property) or
  *        property type (for single valued property) is
  *        {@link javax.xml.bind.JAXBElement}, then
- *        @XmlElementRef}.name() and @XmlElementRef.namespace() must
+ *        {@code @XmlElementRef.name()} and {@code @XmlElementRef.namespace()} must
  *        point an element factory method  with an @XmlElementDecl
  *        annotation in a class annotated  with @XmlRegistry (usually
  *        ObjectFactory class generated by  the schema compiler) :
@@ -155,7 +155,7 @@ import static java.lang.annotation.ElementType.METHOD;
  *     
  * }
          *

          - * It is not an error to have a class that extends Task + * It is not an error to have a class that extends {@code Task} * that doesn't have {@link XmlRootElement}. But they can't show up in an * XML instance (because they don't have XML element names). * @@ -234,8 +234,8 @@ public @interface XmlElementRef { * This parameter and {@link #name()} are used to determine the * XML element for the JavaBean property. * - *

          If type() is JAXBElement.class , then - * namespace() and name() + *

          If {@code type()} is {@code JAXBElement.class} , then + * {@code namespace()} and {@code name()} * point to a factory method with {@link XmlElementDecl}. The XML * element name is the element name from the factory method's * {@link XmlElementDecl} annotation or if an element from its @@ -243,13 +243,13 @@ public @interface XmlElementRef { * substituted in the XML document, then the element name is from the * {@link XmlElementDecl} on the substituted element. * - *

          If {@link #type()} is not JAXBElement.class, then + *

          If {@link #type()} is not {@code JAXBElement.class}, then * the XML element name is the XML element name statically * associated with the type using the annotation {@link * XmlRootElement} on the type. If the type is not annotated with * an {@link XmlElementDecl}, then it is an error. * - *

          If type() is not JAXBElement.class, then + *

          If {@code type()} is not {@code JAXBElement.class}, then * this value must be "". * */ @@ -282,7 +282,7 @@ public @interface XmlElementRef { * for a multivalued property. * *

          - * For compatibility with JAXB 2.1, this property defaults to true, + * For compatibility with JAXB 2.1, this property defaults to {@code true}, * despite the fact that {@link XmlElement#required()} defaults to false. * * @since 1.7, JAXB 2.2 diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java index 69f50411fdc..2be1a33b54e 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java @@ -61,7 +61,7 @@ import java.lang.annotation.Target; * *

          Usage

          *

          - * The @XmlElementWrapper annotation can be used with the + * The {@code @XmlElementWrapper} annotation can be used with the * following program elements: *

            *
          • JavaBean property
            • @@ -120,7 +120,7 @@ public @interface XmlElementWrapper { /** * If true, the absence of the collection is represented by - * using xsi:nil='true'. Otherwise, it is represented by + * using {@code xsi:nil='true'}. Otherwise, it is represented by * the absence of the element. */ boolean nillable() default false; @@ -130,7 +130,7 @@ public @interface XmlElementWrapper { * *

            * If required() is true, then the corresponding generated - * XML schema element declaration will have minOccurs="1", + * XML schema element declaration will have {@code minOccurs="1"}, * to indicate that the wrapper element is always expected. * *

            diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java index fb64513d697..c4cf5747190 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlElements.java @@ -44,7 +44,7 @@ import java.lang.annotation.Target; * @XmlElements({ @XmlElement(...),@XmlElement(...) }) * * - *

            The @XmlElements annotation can be used with the + *

            The {@code @XmlElements} annotation can be used with the * following program elements:

            *
              *
            • a JavaBean property
              • @@ -62,7 +62,7 @@ import java.lang.annotation.Target; * annotations: @{@link XmlIDREF}, @{@link XmlElementWrapper}. *
            • If @XmlIDREF is also specified on the JavaBean property, * then each @XmlElement.type() must contain a JavaBean - * property annotated with @XmlID.
              • + * property annotated with {@code @XmlID}. *
            * *

            See "Package Specification" in javax.xml.bind.package javadoc for diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java index f6059ffed9c..70e9b13a1cb 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnum.java @@ -39,7 +39,7 @@ import java.lang.annotation.Target; * *

            Usage

            *

            - * The @XmlEnum annotation can be used with the + * The {@code @XmlEnum} annotation can be used with the * following program elements: *

              *
            • enum type
              • @@ -56,9 +56,9 @@ import java.lang.annotation.Target; * *

              An enum type is mapped to a schema simple type with enumeration * facets. The schema type is derived from the Java type to which - * @XmlEnum.value(). Each enum constant @XmlEnumValue + * {@code @XmlEnum.value()}. Each enum constant {@code @XmlEnumValue} * must have a valid lexical representation for the type - * @XmlEnum.value() . + * {@code @XmlEnum.value()}. * *

              Examples: See examples in {@link XmlEnumValue} * diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java index fc29ac0786b..e6a66f2f590 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlEnumValue.java @@ -35,7 +35,7 @@ import static java.lang.annotation.ElementType.FIELD; * *

              Usage

              * - *

              The @XmlEnumValue annotation can be used with the + *

              The {@code @XmlEnumValue} annotation can be used with the * following program elements: *

                *
              • enum constant
                • @@ -49,9 +49,9 @@ import static java.lang.annotation.ElementType.FIELD; * *

                An enum type is mapped to a schema simple type with enumeration * facets. The schema type is derived from the Java type specified in - * @XmlEnum.value(). Each enum constant @XmlEnumValue + * {@code @XmlEnum.value()}. Each enum constant {@code @XmlEnumValue} * must have a valid lexical representation for the type - * @XmlEnum.value() + * {@code @XmlEnum.value()} * *

                In the absence of this annotation, {@link Enum#name()} is used * as the XML representation. diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java index 52d03609f02..5b8844a7bce 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlID.java @@ -38,12 +38,12 @@ import static java.lang.annotation.RetentionPolicy.*; * To preserve referential integrity of an object graph across XML * serialization followed by a XML deserialization, requires an object * reference to be marshalled by reference or containment - * appropriately. Annotations @XmlID and @XmlIDREF + * appropriately. Annotations {@code @XmlID} and {@code @XmlIDREF} * together allow a customized mapping of a JavaBean property's * type by containment or reference. * *

                Usage

                - * The @XmlID annotation can be used with the following + * The {@code @XmlID} annotation can be used with the following * program elements: *
                  *
                • a JavaBean property
                  • @@ -56,14 +56,14 @@ import static java.lang.annotation.RetentionPolicy.*; * The usage is subject to the following constraints: *
                    *
                  • At most one field or property in a class can be annotated - * with @XmlID.
                    • - *
                  • The JavaBean property's type must be java.lang.String.
                    • + * with {@code @XmlID}. + *
                  • The JavaBean property's type must be {@code java.lang.String}.
                    • *
                  • The only other mapping annotations that can be used - * with @XmlID - * are:@XmlElement and @XmlAttribute.
                    • + * with {@code @XmlID} + * are: {@code @XmlElement} and {@code @XmlAttribute}. *
                  * - *

                  Example: Map a JavaBean property's type to xs:ID

                  + *

                  Example: Map a JavaBean property's type to {@code xs:ID}

                  * 
                    *    // Example: code fragment
  *    public class Customer {
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java
index 503f936d03e..4e17228b028 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlIDREF.java
@@ -38,12 +38,12 @@ import static java.lang.annotation.RetentionPolicy.*;
  * To preserve referential integrity of an object graph across XML
  * serialization followed by a XML deserialization, requires an object
  * reference to be marshaled by reference or containment
- * appropriately. Annotations @XmlID and @XmlIDREF
+ * appropriately. Annotations {@code @XmlID} and {@code @XmlIDREF}
  * together allow a customized mapping of a JavaBean property's
  * type by containment or reference.
  *
  * 
                  Usage 
                  
- * The @XmlIDREF annotation can be used with the following
+ * The {@code @XmlIDREF} annotation can be used with the following
  * program elements:
  * 
                    
  *   
                  •  a JavaBean property 
                    • 
@@ -58,21 +58,21 @@ import static java.lang.annotation.RetentionPolicy.*;
  *
  *   
                  •  If the type of the field or property is a collection type,
  *        then the collection item type must contain a property or
- *        field annotated with @XmlID.  
                    • 
+ *        field annotated with {@code @XmlID}.  
  *   
                  •  If the field or property is single valued, then the type of
  *        the property or field must contain a property or field
- *        annotated with @XmlID.
+ *        annotated with {@code @XmlID}.
  *        
                    Note: If the collection item type or the type of the
  *        property (for non collection type) is java.lang.Object, then
  *        the instance must contain a property/field annotated with
- *        @XmlID attribute.
+ *        {@code @XmlID} attribute.
  *        
                    • 
  *   
                  •  This annotation can be used with the following annotations:
  *        {@link XmlElement}, {@link XmlAttribute}, {@link XmlList},
  *        and {@link XmlElements}.
                    • 
  *
  * 
                  
- * 
                  Example: Map a JavaBean property to xs:IDREF
+ * 
                  Example: Map a JavaBean property to {@code xs:IDREF}
  *   (i.e. by reference rather than by containment)
                  
  * 
                    *
@@ -101,10 +101,10 @@ import static java.lang.annotation.RetentionPolicy.*;
  * containment versus reference.
  *
  * 
                  - *    // By default, Customer maps to complex type xs:Customer
+ *    // By default, Customer maps to complex type {@code xs:Customer}
  *    public class Customer {
  *
- *        // map JavaBean property type to xs:ID
+ *        // map JavaBean property type to {@code xs:ID}
  *        @XmlID public String getCustomerID();
  *        public void setCustomerID(String id);
  *
@@ -112,7 +112,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *    }
  *
  *
- *   // By default, Invoice maps to a complex type xs:Invoice
+ *   // By default, Invoice maps to a complex type {@code xs:Invoice}
  *   public class Invoice {
  *
  *       // map by reference
@@ -122,7 +122,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *      // .... other properties not shown here
  *   }
  *
- *   // By default, Shipping maps to complex type xs:Shipping
+ *   // By default, Shipping maps to complex type {@code xs:Shipping}
  *   public class Shipping {
  *
  *       // map by reference
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java
index d6beedba4a2..84b29d30b08 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java
@@ -41,7 +41,9 @@ import javax.activation.DataHandler;
  * base64-encoded binary data in XML.
  *
  * 
                  
- * When XOP encoding is enabled as described in {@link AttachmentMarshaller#isXOPPackage()}, this annotation disables datatypes such as {@link java.awt.Image} or {@link Source} or byte[] that are bound to base64-encoded binary from being considered for
+ * When XOP encoding is enabled as described in {@link AttachmentMarshaller#isXOPPackage()},
+ * this annotation disables datatypes such as {@link java.awt.Image} or {@link Source}
+ * or {@code byte[]} that are bound to base64-encoded binary from being considered for
  * XOP encoding. If a JAXB property is annotated with this annotation or if
  * the JAXB property's base type is annotated with this annotation,
  * neither
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java
index 675fbb4b7f2..a01e7eba61f 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlList.java
@@ -37,7 +37,7 @@ import static java.lang.annotation.ElementType.PARAMETER;
  *
  * 
                  Usage 
                  
  * 
                  
- * The @XmlList annotation can be used with the
+ * The {@code @XmlList} annotation can be used with the
  * following program elements:
  * 
                  
  *
  * 
                  
- * This would allow you to do JAXBContext.newInstance(Animal.class).
+ * This would allow you to do {@code JAXBContext.newInstance(Animal.class)}.
  * By the help of this annotation, JAXB implementations will be able to
- * correctly bind Dog and Cat.
+ * correctly bind {@code Dog} and {@code Cat}.
  *
  * @author Kohsuke Kawaguchi
  * @since 1.6, JAXB 2.1
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java
index b3394d5465f..eae54df7947 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlTransient.java
@@ -34,14 +34,14 @@ import static java.lang.annotation.RetentionPolicy.*;
  * 
                  
  * Prevents the mapping of a JavaBean property/type to XML representation.
  * 
                  
- * The @XmlTransient annotation is useful for resolving name
+ * The {@code @XmlTransient} annotation is useful for resolving name
  * collisions between a JavaBean property name and a field name or
  * preventing the mapping of a field/property. A name collision can
  * occur when the decapitalized JavaBean property name and a field
  * name are the same. If the JavaBean property refers to the field,
  * then the name collision can be resolved by preventing the
  * mapping of either the field or the JavaBean property using the
- * @XmlTransient annotation.
+ * {@code @XmlTransient} annotation.
  *
  * 
                  
  * When placed on a class, it indicates that the class shouldn't be mapped
@@ -49,7 +49,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * with its derived classes, as if the class is inlined.
  *
  * 
                  Usage
                  
- * 
                   The @XmlTransient annotation can be used with the following
+ * 
                   The {@code @XmlTransient} annotation can be used with the following
  *     program elements:
  * 
                    
  *   
                  •  a JavaBean property 
                    • 
@@ -57,7 +57,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *   
                  •  class 
                    • 
  * 
                  
  *
- * 
                  @XmlTransientis mutually exclusive with all other
+ * 
                  {@code @XmlTransient} is mutually exclusive with all other
  * JAXB defined annotations. 
                  
  *
  * 
                  See "Package Specification" in javax.xml.bind.package javadoc for
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 f20d4055860..d2c9ea6d0f9 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
@@ -35,7 +35,7 @@ import java.lang.annotation.Target;
  * Maps a class or an enum type to a XML Schema type.
  *
  * 
                  Usage
                  
- * 
                   The @XmlType annnotation can be used with the following program
+ * 
                   The {@code @XmlType} annnotation can be used with the following program
  * elements:
  * 
                    
  *   
                  •  a top level class 
                    • 
@@ -53,8 +53,8 @@ import java.lang.annotation.Target;
  * schema type's content model (e.g. model groups, attributes etc).
  * 
                     To be mapped, a class must either have a public no-arg
  * constructor or a static no-arg factory method. The static factory
- * method can be specified in factoryMethod() and
- * factoryClass() annotation elements. The static factory
+ * method can be specified in {@code factoryMethod()} and
+ * {@code factoryClass()} annotation elements. The static factory
  * method or the no-arg constructor is used during unmarshalling to
  * create an instance of this class. If both are present, the static
  * factory method overrides the no-arg constructor.
@@ -64,7 +64,7 @@ import java.lang.annotation.Target;
  * mapping of JavaBean properties and fields contained within the
  * class. The schema type to which the class is mapped can either be
  * named or anonymous. A class can be mapped to an anonymous schema
- * type by annotating the class with @XmlType(name="").
+ * type by annotating the class with {@code @XmlType(name="")}.
  * 
                    
  * Either a global element, local element or a local attribute can be
  * associated with an anonymous type as follows:
@@ -84,29 +84,29 @@ import java.lang.annotation.Target;
  * 
                  
  *  Mapping to XML Schema Complex Type 
  * 
                    
- *   
                  • If class is annotated with @XmlType(name="") , it
+ *   
                  • If class is annotated with {@code @XmlType(name="") }, it
  *   is mapped to an anonymous type otherwise, the class name maps
- *   to a complex type name. The XmlName() annotation element
+ *   to a complex type name. The {@code XmlName()} annotation element
  *   can be used to customize the name.
                    • 
  *
  *   
                  •  Properties and fields that are mapped to elements are mapped to a
  *   content model within a complex type. The annotation element
- *   propOrder() can be used to customize the content model to be
- *   xs:all or xs:sequence.  It is used for specifying
- *   the order of XML elements in xs:sequence. 
                    • 
+ *   {@code propOrder()} can be used to customize the content model to be
+ *   {@code xs:all} or {@code xs:sequence}.  It is used for specifying
+ *   the order of XML elements in {@code xs:sequence}. 
  *
  *   
                  •  Properties and fields can be mapped to attributes within the
  *        complex type.  
                    • 
  *
  *   
                  •  The targetnamespace of the XML Schema type can be customized
- *        using the annotation element namespace(). 
                    • 
+ *        using the annotation element {@code namespace()}. 
  * 
                  
  *
  * 
                  
  *  Mapping class to XML Schema simple type 
  * 
                  
  * A class can be mapped to a XML Schema simple type using the
- * @XmlValue annotation. For additional details and examples,
+ * {@code @XmlValue} annotation. For additional details and examples,
  * see @{@link XmlValue} annotation type.
  * 
                  
  * The following table shows the mapping of the class to a XML Schema
@@ -114,8 +114,8 @@ import java.lang.annotation.Target;
  * 
                    
  *   
                  •  {@literal ->}    : represents a mapping 
                    • 
  *   
                  •  [x]+  : one or more occurances of x 
                    • 
- *   
                  •  [ @XmlValue property ]: JavaBean property annotated with
- *         @XmlValue
                    • 
+ *   
                  •  [ {@code @XmlValue} property ]: JavaBean property annotated with
+ *         {@code @XmlValue}
                    • 
  *   
                  •  X     : don't care
  * 
                  
  * 
                  
@@ -156,7 +156,7 @@ import java.lang.annotation.Target;
  *       
  *         Class
  *         X
- *         1 [@XmlValue property] {@literal &&} 
                   [property]+ {@literal ->} attributes
+ *         1 [{@code @XmlValue} property] {@literal &&} 
                   [property]+ {@literal ->} attributes
  *         simplecontent
  *          
  *       
@@ -164,7 +164,7 @@ import java.lang.annotation.Target;
  *       
  *         Class
  *         X
- *         1 [@XmlValue property] {@literal &&} 
                   no properties {@literal ->} attribute
+ *         1 [{@code @XmlValue} property] {@literal &&} 
                   no properties {@literal ->} attribute
  *          
  *         simpletype
  *       
@@ -176,8 +176,8 @@ import java.lang.annotation.Target;
  *
  * An enum type maps to a XML schema simple type with enumeration
  * facets. The following annotation elements are ignored since they
- * are not meaningful: propOrder() , factoryMethod() ,
- * factoryClass() .
+ * are not meaningful: {@code propOrder()} , {@code factoryMethod()} ,
+ * {@code factoryClass()} .
  *
  *  
                   Usage with other annotations 
                  
  * 
                   This annotation can be used with the following annotations:
@@ -406,7 +406,7 @@ public @interface XmlType {
      * 
                   All of the JavaBean properties being mapped to XML Schema elements
      *     must be listed.
      * 
                   A JavaBean property or field listed in propOrder must not
-     *     be transient or annotated with @XmlTransient.
+     *     be transient or annotated with {@code @XmlTransient}.
      * 
                   The default ordering of JavaBean properties is determined
      *     by @{@link XmlAccessorOrder}.
      */
@@ -423,18 +423,18 @@ public @interface XmlType {
      * Class containing a no-arg factory method for creating an
      * instance of this class. The default is this class.
      *
-     * 
                  If factoryClass is DEFAULT.class and
-     * factoryMethod is "", then there is no static factory
+     * 
                  If {@code factoryClass} is DEFAULT.class and
+     * {@code factoryMethod} is "", then there is no static factory
      * method.
      *
-     * 
                  If factoryClass is DEFAULT.class and
-     * factoryMethod is not "", then
-     * factoryMethod is the name of a static factory method
+     * 
                  If {@code factoryClass} is DEFAULT.class and
+     * {@code factoryMethod} is not "", then
+     * {@code factoryMethod} is the name of a static factory method
      * in this class.
      *
-     * 
                  If factoryClass is not DEFAULT.class, then
-     * factoryMethod must not be "" and must be the name of
-     * a static factory method specified in factoryClass.
+     * 
                  If {@code factoryClass} is not DEFAULT.class, then
+     * {@code factoryMethod} must not be "" and must be the name of
+     * a static factory method specified in {@code factoryClass}.
      */
     Class factoryClass() default DEFAULT.class;
 
@@ -447,7 +447,7 @@ public @interface XmlType {
 
     /**
      * Name of a no-arg factory method in the class specified in
-     * factoryClass factoryClass().
+     * {@code factoryClass} factoryClass().
      *
      */
     String factoryMethod() default "";
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java
index 675305b5821..21ecad0589f 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlValue.java
@@ -39,7 +39,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * 
                  
  *  Usage: 
  * 
                  
- * The @XmlValue annotation can be used with the following program
+ * The {@code @XmlValue} annotation can be used with the following program
  * elements:
  * 
                    
  *   
                  •  a JavaBean property.
                    • 
@@ -52,9 +52,9 @@ import static java.lang.annotation.RetentionPolicy.*;
  * The usage is subject to the following usage constraints:
  * 
                      
  *   
                    • At most one field or property can be annotated with the
- *       @XmlValue annotation. 
                      • 
+ *       {@code @XmlValue} annotation. 
  *
- *   
                    • @XmlValue can be used with the following
+ *   
                    • {@code @XmlValue} can be used with the following
  *   annotations: {@link XmlList}. However this is redundant since
  *   {@link XmlList} maps a type to a simple schema type that derives by
  *   list just as {@link XmlValue} would. 
                      • 
@@ -73,7 +73,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * simple type.
  *
  * If there are additional JavaBean properties (other than the
- * JavaBean property annotated with @XmlValue annotation)
+ * JavaBean property annotated with {@code @XmlValue} annotation)
  * that are mapped to XML attributes, then the class is mapped to a
  * complex type with simpleContent.
  * 
                      
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
index 38865a0c32f..aa57b30617b 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
@@ -28,7 +28,7 @@ package javax.xml.bind.annotation.adapters;
 
 
 /**
- * Built-in {@link XmlAdapter} to handle xs:token and its derived types.
+ * Built-in {@link XmlAdapter} to handle {@code xs:token} and its derived types.
  *
  * 
                      
  * This adapter removes leading and trailing whitespaces, then truncate any
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
index 153378a788d..ef99e3671fa 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
@@ -28,10 +28,10 @@ package javax.xml.bind.annotation.adapters;
 import javax.xml.bind.DatatypeConverter;
 
 /**
- * {@link XmlAdapter} for xs:hexBinary.
+ * {@link XmlAdapter} for {@code xs:hexBinary}.
  *
  * 
                      
- * This {@link XmlAdapter} binds byte[] to the hexBinary representation in XML.
+ * This {@link XmlAdapter} binds {@code byte[]} to the hexBinary representation in XML.
  *
  * @author Kohsuke Kawaguchi
  * @since 1.6, JAXB 2.0
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
index 3c64dd48bb2..b736ca50135 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
@@ -28,7 +28,7 @@ package javax.xml.bind.annotation.adapters;
 
 
 /**
- * {@link XmlAdapter} to handle xs:normalizedString.
+ * {@link XmlAdapter} to handle {@code xs:normalizedString}.
  *
  * 
                      
  * Replaces any tab, CR, and LF by a whitespace character ' ',
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java
index 3c5bd422512..897bbd325d8 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java
@@ -32,7 +32,7 @@ package javax.xml.bind.annotation.adapters;
  *
  * 
                      
  * Some Java types do not map naturally to a XML representation, for
- * example HashMap or other non JavaBean classes. Conversely,
+ * example {@code HashMap} or other non JavaBean classes. Conversely,
  * a XML repsentation may map to a Java type but an application may
  * choose to accesss the XML representation using another Java
  * type. For example, the schema to Java binding rules bind
@@ -68,10 +68,10 @@ package javax.xml.bind.annotation.adapters;
  *        XmlJavaTypeAdapter} 
  * 
                    
  *
- * 
                    Example: Customized mapping of HashMap
                    
+ * 
                    Example: Customized mapping of {@code HashMap}
                    
  * 
                     The following example illustrates the use of
- * @XmlAdapter and @XmlJavaTypeAdapter to
- * customize the mapping of a HashMap.
+ * {@code @XmlAdapter} and {@code @XmlJavaTypeAdapter} to
+ * customize the mapping of a {@code HashMap}.
  *
  * 
                      Step 1:  Determine the desired XML representation for HashMap.
  *
@@ -154,7 +154,7 @@ package javax.xml.bind.annotation.adapters;
  * @param 
  *      The type that JAXB doesn't know how to handle. An adapter is written
  *      to allow this type to be used as an in-memory representation through
- *      the ValueType.
+ *      the {@code ValueType}.
  * @param 
  *      The type that JAXB knows how to handle out of the box.
  *
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
index a296ae8e50e..c0578e8d50c 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
@@ -50,7 +50,7 @@ import static java.lang.annotation.ElementType.PACKAGE;
  *
  * 
                      Usage:  
                    
  *
- * 
                     The @XmlJavaTypeAdapter annotation can be used with the
+ * 
                     The {@code @XmlJavaTypeAdapter} annotation can be used with the
  * following program elements:
  * 
                      
  *   
                    •  a JavaBean property 
                      • 
@@ -60,20 +60,20 @@ import static java.lang.annotation.ElementType.PACKAGE;
  *   
                    •  from within {@link XmlJavaTypeAdapters} 
                      • 
  * 
                    
  *
- * 
                     When @XmlJavaTypeAdapter annotation is defined on a
+ * 
                     When {@code @XmlJavaTypeAdapter} annotation is defined on a
  * class, it applies to all references to the class.
- * 
                     When @XmlJavaTypeAdapter annotation is defined at the
+ * 
                     When {@code @XmlJavaTypeAdapter} annotation is defined at the
  * package level it applies to all references from within the package
- * to @XmlJavaTypeAdapter.type().
- * 
                     When @XmlJavaTypeAdapter annotation is defined on the
+ * to {@code @XmlJavaTypeAdapter.type()}.
+ * 
                     When {@code @XmlJavaTypeAdapter} annotation is defined on the
  * field, property or parameter, then the annotation applies to the
  * field, property or the parameter only.
- * 
                     A @XmlJavaTypeAdapter annotation on a field, property
- * or parameter overrides the @XmlJavaTypeAdapter annotation
+ * 
                     A {@code @XmlJavaTypeAdapter} annotation on a field, property
+ * or parameter overrides the {@code @XmlJavaTypeAdapter} annotation
  * associated with the class being referenced by the field, property
  * or parameter.
- * 
                     A @XmlJavaTypeAdapter annotation on a class overrides
- * the @XmlJavaTypeAdapter annotation specified at the
+ * 
                     A {@code @XmlJavaTypeAdapter} annotation on a class overrides
+ * the {@code @XmlJavaTypeAdapter} annotation specified at the
  * package level for that class.
  *
  * 
                    This annotation can be used with the following other annotations:
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
index 2f1ee037750..06b1cdf3dfe 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
@@ -42,7 +42,7 @@ import java.lang.annotation.Target;
  * @XmlJavaTypeAdapters ({ @XmlJavaTypeAdapter(...),@XmlJavaTypeAdapter(...) })
  * 
                  
  *
- * 
                  The @XmlJavaTypeAdapters annotation is useful for
+ * 
                  The {@code @XmlJavaTypeAdapters} annotation is useful for
  * defining {@link XmlJavaTypeAdapter} annotations for different types
  * at the package level.
  *
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java
index 8edbc8812eb..92876ae6ac3 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java
@@ -123,7 +123,7 @@ public abstract class AttachmentMarshaller {
      *
      * @param data
      *      represents the data to be attached. Must be non-null. The actual data region is
-     *      specified by (data,offset,length) tuple.
+     *      specified by {@code (data,offset,length)} tuple.
      *
      * @param offset
      *       The offset within the array of the first byte to be read;
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java
index 3ce6621a44b..0fa3fe3f7ac 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java
@@ -36,9 +36,10 @@ import javax.activation.DataHandler;
  * understanding of the packaging format being used to a MIME-based
  * package processor that implements this abstract class.
                  
  *
- * 
                  This abstract class identifies if a package requires XOP processing, {@link #isXOPPackage()} and provides retrieval of binary content stored as attachments by content-id.
                  
+ * 
                  This abstract class identifies if a package requires XOP processing, {@link #isXOPPackage()}
+ * and provides retrieval of binary content stored as attachments by content-id.
                  
  *
- * 
                  Identifying the content-id, cid, to pass to getAttachment*(String cid)
                  
+ * 
                  Identifying the content-id, cid, to pass to {@code getAttachment*(String cid)}
                  
  * 
  *
@@ -66,9 +68,9 @@ import javax.activation.DataHandler;
  */
 public abstract class AttachmentUnmarshaller {
    /**
-    * 
                  Lookup MIME content by content-id, cid, and return as a {@link DataHandler}.
                  
+    * 
                  Lookup MIME content by content-id, {@code cid}, and return as a {@link DataHandler}.
                  
     *
-    * 
                  The returned DataHandler instance must be configured
+    * 
                  The returned {@code DataHandler} instance must be configured
     * to meet the following required mapping constaint.
     * 
     *   
@@ -81,8 +83,8 @@ public abstract class AttachmentUnmarshaller {
     *       
     *     
     *     
-    *       
-    *       
+    *       
+    *       
     *     
     *   
     *   
@@ -103,8 +105,8 @@ public abstract class AttachmentUnmarshaller {
     * Note that it is allowable to support additional mappings.
     *
     * @param cid It is expected to be a valid lexical form of the XML Schema
-    * xs:anyURI datatype. If {@link #isXOPPackage()}
-    * ==true, it must be a valid URI per the cid: URI scheme (see RFC 2387)
+    * {@code xs:anyURI} datatype. If {@link #isXOPPackage()}{@code ==true},
+    * it must be a valid URI per the {@code cid:} URI scheme (see RFC 2387)
     *
     * @return
     *       a {@link DataHandler} that represents the MIME attachment.
@@ -114,11 +116,11 @@ public abstract class AttachmentUnmarshaller {
    public abstract DataHandler getAttachmentAsDataHandler(String cid);
 
     /**
-     * 
                  Retrieve the attachment identified by content-id, cid,  as a byte[]
                  .
+     * 
                  Retrieve the attachment identified by content-id, {@code cid}, as a {@code byte[]}.
      *
      * @param cid It is expected to be a valid lexical form of the XML Schema
-     * xs:anyURI datatype. If {@link #isXOPPackage()}
-     * ==true, it must be a valid URI per the cid: URI scheme (see RFC 2387)
+     * {@code xs:anyURI} datatype. If {@link #isXOPPackage()}{@code ==true},
+     * it must be a valid URI per the {@code cid:} URI scheme (see RFC 2387)
      *
      * @return byte[] representation of attachment identified by cid.
      *
@@ -129,7 +131,7 @@ public abstract class AttachmentUnmarshaller {
     /**
      * 
                  Read-only property that returns true if JAXB unmarshaller needs to perform XOP processing.
                  
      *
-     * 
                  This method returns true when the constraints specified
+     * 
                  This method returns {@code true} when the constraints specified
      * in  Identifying XOP Documents are met.
      * This value must not change during the unmarshalling process.
                  
      *
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java
index 35d47b6c1c3..77634879218 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java
@@ -48,7 +48,7 @@ import java.io.IOException;
 // import java.nio.charset.UnsupportedCharsetException;
 
 /**
- * Partial default Marshaller implementation.
+ * Partial default {@code Marshaller} implementation.
  *
  * 
                  
  * This class provides a partial default implementation for the
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
index e51d6338a8e..cef1cf68e72 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
@@ -53,7 +53,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 /**
- * Partial default Unmarshaller implementation.
+ * Partial default {@code Unmarshaller} implementation.
  *
  * 
                  
  * This class provides a partial default implementation for the
@@ -246,7 +246,7 @@ public abstract class AbstractUnmarshallerImpl implements Unmarshaller
      * 
                  
      * The validation event handler will be called by the JAXB Provider if any
      * validation errors are encountered during calls to any of the
-     * unmarshal methods.  If the client application does not register
+     * {@code unmarshal} methods.  If the client application does not register
      * a validation event handler before invoking the unmarshal methods, then
      * all validation events will be silently ignored and may result in
      * unexpected behaviour.
@@ -267,7 +267,7 @@ public abstract class AbstractUnmarshallerImpl implements Unmarshaller
 
     /**
      * Specifies whether or not the Unmarshaller should validate during
-     * unmarshal operations.  By default, the Unmarshaller does
+     * unmarshal operations. By default, the {@code Unmarshaller} does
      * not validate.
      * 
                  
      * This method may only be invoked before or after calling one of the
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package.html b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package.html
index 31a91a6dd80..059abed0a0b 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package.html
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/helpers/package.html
@@ -34,7 +34,7 @@
 
         
                  
         JAXB Provider Use Only: Provides partial default implementations for 
-        some of the javax.xml.bind interfaces.
+        some of the javax.xml.bind interfaces.
 
         
                  
         JAXB Providers can extend these classes and implement the abstract 
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/package.html b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/package.html
index 524ae643574..862e8efa819 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/package.html
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/package.html
@@ -37,7 +37,7 @@
         unmarshalling, marshalling, and validation capabilities.
 
         
                  
-        JAXBContext is the client-entry point to the runtime binding
+        JAXBContext is the client-entry point to the runtime binding
         framework.
 
 
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
index ea011ddeaa9..7adf460cbb6 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
@@ -144,7 +144,7 @@ public class SOAPExceptionImpl extends SOAPException {
      * @param  cause the Throwable object that caused this
      *         SOAPExceptionImpl object to be thrown.  The value of this
      *         parameter is saved for later retrieval by the
-     *         {@link #getCause()} method.  A null value is
+     *         {@link #getCause()} method.  A {@code null} value is
      *         permitted and indicates that the cause is nonexistent or
      *         unknown.
      * @return  a reference to this SOAPExceptionImpl instance
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java
index 4cb0093b6ac..0b829f23739 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java
@@ -69,7 +69,7 @@ public class WsaPropertyBag extends BasePropertySet {
     }
 
     /**
-     * Gets the wsa:To header.
+     * Gets the {@code wsa:To} header.
      *
      * @return
      *      null if the incoming SOAP message didn't have the header.
@@ -85,7 +85,7 @@ public class WsaPropertyBag extends BasePropertySet {
     }
 
     /**
-     * Gets the wsa:To header.
+     * Gets the {@code wsa:To} header.
      *
      * @return
      *      null if the incoming SOAP message didn't have the header.
@@ -101,7 +101,7 @@ public class WsaPropertyBag extends BasePropertySet {
     }
 
     /**
-     * Gets the wsa:From header.
+     * Gets the {@code wsa:From} header.
      *
      * @return
      *      null if the incoming SOAP message didn't have the header.
@@ -112,7 +112,7 @@ public class WsaPropertyBag extends BasePropertySet {
     }
 
     /**
-     * Gets the wsa:Action header content as String.
+     * Gets the {@code wsa:Action} header content as String.
      *
      * @return
      *      null if the incoming SOAP message didn't have the header.
@@ -128,7 +128,7 @@ public class WsaPropertyBag extends BasePropertySet {
     }
 
     /**
-     * Gets the wsa:MessageID header content as String.
+     * Gets the {@code wsa:MessageID} header content as String.
      *
      * @return
      *      null if the incoming SOAP message didn't have the header.
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java
index 5d185d7b446..de96b1017f4 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingID.java
@@ -164,7 +164,7 @@ public abstract class BindingID {
      *
      * 
                  
      * For example, {@link BindingID} for
-     * "{@value SOAPBinding#SOAP11HTTP_MTOM_BINDING}"
+     * {@code "{@value SOAPBinding#SOAP11HTTP_MTOM_BINDING}"}
      * would always return a list that has {@link MTOMFeature} enabled.
      */
     public WebServiceFeatureList createBuiltinFeatureList() {
@@ -189,7 +189,7 @@ public abstract class BindingID {
      *
      * 
                  
      * Some binding ID, such as those for SOAP/HTTP, uses the URL
-     * query syntax (like ?mtom=true) to control
+     * query syntax (like {@code ?mtom=true}) to control
      * the optional part of the binding. This method obtains
      * the value for such optional parts.
      *
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java
index 2ef187ac0a3..6d32ae2d2db 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java
@@ -36,7 +36,7 @@ import javax.xml.ws.WebServiceException;
  * 
                  
  * When the JAX-WS RI is asked to parse a binding ID string into a {@link BindingID}
  * object, it uses service idiom to look for the implementations of this class
- * in the META-INF/services/....
+ * in the {@code META-INF/services/...}.
  *
  * @since JAX-WS 2.0.next
  * @author Kohsuke Kawaguchi
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java
index 38ae85a90ea..fefbfcecda4 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/Cancelable.java
@@ -35,18 +35,18 @@ public interface Cancelable {
      * Attempts to cancel execution of this task.  This attempt will
      * fail if the task has already completed, has already been cancelled,
      * or could not be cancelled for some other reason. If successful,
-     * and this task has not started when cancel is called,
+     * and this task has not started when {@code cancel} is called,
      * this task should never run.  If the task has already started,
-     * then the mayInterruptIfRunning parameter determines
+     * then the {@code mayInterruptIfRunning} parameter determines
      * whether the thread executing this task should be interrupted in
      * an attempt to stop the task.
      *
-     * @param mayInterruptIfRunning true if the thread executing this
+     * @param mayInterruptIfRunning {@code true} if the thread executing this
      * task should be interrupted; otherwise, in-progress tasks are allowed
      * to complete
-     * @return false if the task could not be cancelled,
+     * @return {@code false} if the task could not be cancelled,
      * typically because it has already completed normally;
-     * true otherwise
+     * {@code true} otherwise
      */
         public void cancel(boolean mayInterruptIfRunning);
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java
index 2265e64892f..7e822d08b10 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java
@@ -63,7 +63,7 @@ public abstract class ClientPipelineHook {
      *      eventually processes messages.
      *
      * @return
-     *      The default implementation just returns tail, which means
+     *      The default implementation just returns {@code tail}, which means
      *      no additional pipe is inserted. If the implementation adds
      *      new pipes, return the new head pipe.
      */
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java
index d4b0f822107..07121f448c1 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java
@@ -68,7 +68,7 @@ public abstract class ServiceInterceptor {
      * @return
      *      A set of features to be added to the newly created {@link WSBinding}.
      *      Can be empty but never null.
-     *      defaultFeatures will take precedence over what this method
+     *      {@code defaultFeatures} will take precedence over what this method
      *      would return (because it includes user-specified ones which will
      *      take the at-most priority), but features you return from this method
      *      will take precedence over {@link BindingID}'s
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java
index a2df11486ad..058cc959216 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Header.java
@@ -101,7 +101,7 @@ public interface Header {
      * specifically, this method has to perform the following tasks:
      *
      * 
                    
-     *  
                  • If this header does not have mustUnderstand as "1" nor "true",
+     *  
                  • If this header does not have {@code mustUnderstand} as "1" nor "true",
      *      then this method must return true.
      *  
                  • Otherwise, check the role attribute (for SOAP 1.2) or the actor attribute (for SOAP 1.1).
      *      When those attributes are absent, the default values have to be assumed.
@@ -300,7 +300,7 @@ public interface Header {
      *
      * 
                    
      * A header is responsible for producing the SAX events for its part,
-     * including startPrefixMapping and endPrefixMapping,
+     * including {@code startPrefixMapping} and {@code endPrefixMapping},
      * but not startDocument/endDocument.
      *
      * 
                    
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java
index 9f32f765a19..ceac6b76fb8 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java
@@ -87,13 +87,13 @@ import java.util.Arrays;
  * There are two ways to mark a header as understood:
  *
  * 
                      
- *  
                    1. Use one of the getXXX methods that take a
- *      boolean markAsUnderstood parameter.
+ *  
                    2. Use one of the {@code getXXX} methods that take a
+ *      boolean {@code markAsUnderstood} parameter.
  *      Most often, a {@link Pipe} knows it's going to understand a header
  *      as long as it's present, so this is the easiest and thus the preferred way.
  *
  *      For example, if JAX-WSA looks for <wsa:To>, then it can set
- *      markAsUnderstand to true, to do the obtaining of a header
+ *      {@code markAsUnderstand} to true, to do the obtaining of a header
  *      and marking at the same time.
  *
  *  
                    3. Call {@link #understood(int)}.
@@ -489,14 +489,14 @@ public class HeaderList extends ArrayList
                       implements MessageHeaders {
     }
 
     /**
-     * Returns the value of WS-Addressing To header. The version
+     * Returns the value of WS-Addressing {@code To} header. The {@code version}
      * identifies the WS-Addressing version and the header returned is targeted at
      * the current implicit role. Caches the value for subsequent invocation.
-     * Duplicate To headers are detected earlier.
+     * Duplicate {@code To} headers are detected earlier.
      *
      * @param av WS-Addressing version
      * @param sv SOAP version
-     * @throws IllegalArgumentException if either av or sv is null.
+     * @throws IllegalArgumentException if either {@code av} or {@code sv} is null.
      * @return Value of WS-Addressing To header, anonymous URI if no header is present
      */
     public String getTo(AddressingVersion av, SOAPVersion sv) {
@@ -504,14 +504,14 @@ public class HeaderList extends ArrayList
                       implements MessageHeaders {
     }
 
     /**
-     * Returns the value of WS-Addressing Action header. The version
+     * Returns the value of WS-Addressing {@code Action} header. The {@code version}
      * identifies the WS-Addressing version and the header returned is targeted at
      * the current implicit role. Caches the value for subsequent invocation.
-     * Duplicate Action headers are detected earlier.
+     * Duplicate {@code Action} headers are detected earlier.
      *
      * @param av WS-Addressing version
      * @param sv SOAP version
-     * @throws IllegalArgumentException if either av or sv is null.
+     * @throws IllegalArgumentException if either {@code av} or {@code sv} is null.
      * @return Value of WS-Addressing Action header, null if no header is present
      */
     public String getAction(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
@@ -519,14 +519,14 @@ public class HeaderList extends ArrayList
                       implements MessageHeaders {
     }
 
     /**
-     * Returns the value of WS-Addressing ReplyTo header. The version
+     * Returns the value of WS-Addressing {@code ReplyTo} header. The {@code version}
      * identifies the WS-Addressing version and the header returned is targeted at
      * the current implicit role. Caches the value for subsequent invocation.
-     * Duplicate ReplyTo headers are detected earlier.
+     * Duplicate {@code ReplyTo} headers are detected earlier.
      *
      * @param av WS-Addressing version
      * @param sv SOAP version
-     * @throws IllegalArgumentException if either av or sv is null.
+     * @throws IllegalArgumentException if either {@code av} or {@code sv} is null.
      * @return Value of WS-Addressing ReplyTo header, null if no header is present
      */
     public WSEndpointReference getReplyTo(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
@@ -534,14 +534,14 @@ public class HeaderList extends ArrayList
                       implements MessageHeaders {
     }
 
     /**
-     * Returns the value of WS-Addressing FaultTo header. The version
+     * Returns the value of WS-Addressing {@code FaultTo} header. The {@code version}
      * identifies the WS-Addressing version and the header returned is targeted at
      * the current implicit role. Caches the value for subsequent invocation.
-     * Duplicate FaultTo headers are detected earlier.
+     * Duplicate {@code FaultTo} headers are detected earlier.
      *
      * @param av WS-Addressing version
      * @param sv SOAP version
-     * @throws IllegalArgumentException if either av or sv is null.
+     * @throws IllegalArgumentException if either {@code av} or {@code sv} is null.
      * @return Value of WS-Addressing FaultTo header, null if no header is present
      */
     public WSEndpointReference getFaultTo(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
@@ -549,14 +549,14 @@ public class HeaderList extends ArrayList
                       implements MessageHeaders {
     }
 
     /**
-     * Returns the value of WS-Addressing MessageID header. The version
+     * Returns the value of WS-Addressing {@code MessageID} header. The {@code version}
      * identifies the WS-Addressing version and the header returned is targeted at
      * the current implicit role. Caches the value for subsequent invocation.
-     * Duplicate MessageID headers are detected earlier.
+     * Duplicate {@code MessageID} headers are detected earlier.
      *
      * @param av WS-Addressing version
      * @param sv SOAP version
-     * @throws WebServiceException if either av or sv is null.
+     * @throws WebServiceException if either {@code av} or {@code sv} is null.
      * @return Value of WS-Addressing MessageID header, null if no header is present
      */
     public String getMessageID(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
@@ -564,14 +564,14 @@ public class HeaderList extends ArrayList
                       implements MessageHeaders {
     }
 
     /**
-     * Returns the value of WS-Addressing RelatesTo header. The version
+     * Returns the value of WS-Addressing {@code RelatesTo} header. The {@code version}
      * identifies the WS-Addressing version and the header returned is targeted at
      * the current implicit role. Caches the value for subsequent invocation.
-     * Duplicate RelatesTo headers are detected earlier.
+     * Duplicate {@code RelatesTo} headers are detected earlier.
      *
      * @param av WS-Addressing version
      * @param sv SOAP version
-     * @throws WebServiceException if either av or sv is null.
+     * @throws WebServiceException if either {@code av} or {@code sv} is null.
      * @return Value of WS-Addressing RelatesTo header, null if no header is present
      */
     public String getRelatesTo(@NotNull AddressingVersion av, @NotNull SOAPVersion sv) {
@@ -803,14 +803,15 @@ public class HeaderList extends ArrayList
                       implements MessageHeaders {
     /**
      * Removes a single instance of the specified element from this
      * header list, if it is present.  More formally,
-     * removes a header h such that (o==null ? h==null :
-     * o.equals(h)), if the header list contains one or more such
-     * headers.  Returns true if the list contained the
+     * removes a header {@code h} such that
+     * {@code (o==null ? h==null : o.equals(h))},
+     * if the header list contains one or more such
+     * headers.  Returns {@code true} if the list contained the
      * specified element (or equivalently, if the list changed as a
      * result of the call).
                      
      *
      * @param o element to be removed from this list, if present.
-     * @return true if the list contained the specified element.
+     * @return {@code true} if the list contained the specified element.
      * @see #remove(javax.xml.namespace.QName)
      */
     @Override
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java
index c118e6639d0..0d52951815e 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Message.java
@@ -446,14 +446,14 @@ public abstract class Message {
      *
      * 
                      
      * A message without a payload is a SOAP message that looks like:
-     * 
                      
+     * <pre>{@code
      * <S:Envelope>
      *   <S:Header>
      *     ...
      *   </S:Header>
      *   <S:Body />
      * </S:Envelope>
-     * 
                      
+     * }
      */
     public abstract boolean hasPayload();
 
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java
index 34c905ebfde..2f79ef9b27f 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/Packet.java
@@ -347,7 +347,7 @@ public final class Packet
      * 
                      
      * Transports may choose to ignore certain headers that interfere with
      * its correct operation, such as
-     * Content-Type and Content-Length.
+     * {@code Content-Type} and {@code Content-Length}.
      */
     public static final String OUTBOUND_TRANSPORT_HEADERS = "com.sun.xml.internal.ws.api.message.packet.outbound.transport.headers";
 
@@ -588,7 +588,7 @@ public final class Packet
      *
      * 
                      
      * For outgoing messages, the transport may sends out this value.
-     * If this field is null, the transport may choose to send ""
+     * If this field is null, the transport may choose to send {@code ""}
      * (quoted empty string.)
      *
      * For incoming messages, the transport will set this field.
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java
index 54e24675f51..0ec964cfdf8 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java
@@ -81,7 +81,7 @@ public interface Parameter {
     int getIndex();
 
     /**
-     * @return true if this instanceof {@link com.sun.xml.internal.ws.model.WrapperParameter}.
+     * @return true if {@code this instanceof} {@link com.sun.xml.internal.ws.model.WrapperParameter}.
      */
     boolean isWrapperStyle();
 
@@ -89,7 +89,7 @@ public interface Parameter {
      * Returns true if this parameter is bound to the return value from the {@link JavaMethod}.
      *
      * 
                      
-     * Just the convenience method for getIndex()==-1
+     * Just the convenience method for {@code getIndex()==-1}
      */
     boolean isReturnValue();
 
@@ -138,7 +138,7 @@ public interface Parameter {
      * 
                      
      * {@link JavaMethod#getResponseParameters()} is guaranteed to have
      * at most one such {@link Parameter}. Note that there coule be none,
-     * in which case the method returns void.
+     * in which case the method returns {@code void}.
      *
      * 
                      
      * Other response parameters are bound to {@link Holder}.
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java
index f9abc4fa718..b8d682f783f 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java
@@ -179,7 +179,7 @@ public interface Codec {
      *      
                      
      *      If the {@link Codec} implementation is already
      *      re-entrant and multi-thread safe to begin with,
-     *      then this method may simply return this.
+     *      then this method may simply return {@code this}.
      */
     Codec copy();
 
@@ -208,7 +208,7 @@ public interface Codec {
      *      The MIME content type (like "application/xml") of this byte stream.
      *      Thie text includes all the sub-headers of the content-type header. Therefore,
      *      in more complex case, this could be something like
-     *      multipart/related; boundary="--=_outer_boundary"; type="multipart/alternative".
+     *      {@code multipart/related; boundary="--=_outer_boundary"; type="multipart/alternative"}.
      *      This parameter must not be null.
      *
      * @param response
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java
index 516da56cbbd..324181e4a47 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java
@@ -319,7 +319,7 @@ public final class Fiber implements Runnable, Cancelable, ComponentRegistry {
      * This method works like {@link Thread#start()}.
      *
      * @param tubeline           The first tube of the tubeline that will act on the packet.
-     * @param request            The request packet to be passed to startPoint.processRequest().
+     * @param request            The request packet to be passed to {@code startPoint.processRequest()}.
      * @param completionCallback The callback to be invoked when the processing is finished and the
      *                           final response packet is available.
      * @see #runSync(Tube, Packet)
@@ -385,7 +385,7 @@ public final class Fiber implements Runnable, Cancelable, ComponentRegistry {
      * @param tubeline
      *      The first tube of the tubeline that will act on the packet.
      * @param request
-     *      The request packet to be passed to startPoint.processRequest().
+     *      The request packet to be passed to {@code startPoint.processRequest()}.
      * @param completionCallback
      *      The callback to be invoked when the processing is finished and the
      *      final response packet is available.
@@ -835,8 +835,8 @@ public final class Fiber implements Runnable, Cancelable, ComponentRegistry {
      * 
      *
      * @param tubeline The first tube of the tubeline that will act on the packet.
-     * @param request  The request packet to be passed to startPoint.processRequest().
-     * @return The response packet to the request.
+     * @param request  The request packet to be passed to {@code startPoint.processRequest()}.
+     * @return The response packet to the {@code request}.
      * @see #start(Tube, Packet, CompletionCallback)
      */
     public
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java
index 0762a4b2e6e..4c0530e22a6 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java
@@ -44,7 +44,7 @@ import java.security.PrivilegedAction;
  * 
                      
  * The design also encapsulates the entire fiber execution in a single
  * opaque method invocation {@link Work#execute}, allowing the use of
- * finally block.
+ * {@code finally} block.
  *
  *
  * @author Kohsuke Kawaguchi
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java
index dd3dbc733f2..94c1d5426fc 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java
@@ -177,7 +177,7 @@ import javax.xml.ws.handler.soap.SOAPHandler;
  *
  * 
                      VM-wide state
                      
  * 
                      
- * static is always there for you to use.
+ * {@code static} is always there for you to use.
  *
  *
  *
@@ -323,7 +323,7 @@ public interface Pipe {
      * that you delegate to.
      * 
                      
      * For limited number of {@link Pipe}s that do not maintain any
-     * thread unsafe resource, it is allowed to simply return this
+     * thread unsafe resource, it is allowed to simply return {@code this}
      * from this method (notice that even if you are stateless, if you
      * got a delegating {@link Pipe} and that one isn't stateless, you
      * still have to copy yourself.)
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java
index f9096db508d..48fd3b477db 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java
@@ -37,7 +37,7 @@ import java.util.logging.Logger;
  * 
                      
  * To create a pipeline,
  * the JAX-WS runtime locates {@link PipelineAssemblerFactory}s through
- * the META-INF/services/com.sun.xml.internal.ws.api.pipe.PipelineAssemblerFactory files.
+ * the {@code META-INF/services/com.sun.xml.internal.ws.api.pipe.PipelineAssemblerFactory} files.
  * Factories found are checked to see if it supports the given binding ID one by one,
  * and the first valid {@link PipelineAssembler} returned will be used to create
  * a pipeline.
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java
index c521c069e28..83cdfa249b4 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java
@@ -75,9 +75,9 @@ import java.lang.reflect.Proxy;
  * 
                      Pipe next
                      
  * 
                      
  * Stubs turn a method invocation into a {@link Pipe#process(com.sun.xml.internal.ws.api.message.Packet)} invocation,
- * and this pipe passed in as the next parameter will receive a {@link Message}
+ * and this pipe passed in as the {@code next} parameter will receive a {@link Message}
  * from newly created stub. All the methods taking Tube <> parameter are deprecated. JAX-WS Runtime takes care of
- * creating the tubeline when the next parameter is not passed. This gives flexibility for the JAX-WS Runtime
+ * creating the tubeline when the {@code next} parameter is not passed. This gives flexibility for the JAX-WS Runtime
  * to pass extra information during the tube line creation via {@link ClientTubeAssemblerContext}.
  *
  * 
                      WSPortInfo portInfo
                      
@@ -87,7 +87,7 @@ import java.lang.reflect.Proxy;
  * 
                      BindingImpl binding
                      
  * 
                      
  * Stubs implement {@link BindingProvider}, and its {@link BindingProvider#getBinding()}
- * will return this binding object. Stubs often also use this information
+ * will return this {@code binding} object. Stubs often also use this information
  * to decide which SOAP version a {@link Message} should be created in.
  *
  * 
                      {@link WSService} service
                      
@@ -98,7 +98,7 @@ import java.lang.reflect.Proxy;
  * 
                      {@link WSEndpointReference} epr
                      
  * 
                      
  * If you want the created {@link Dispatch} to talk to the given EPR, specify the parameter.
- * Otherwise leave it null. Note that the addressing needs to be enabled separately
+ * Otherwise leave it {@code null}. Note that the addressing needs to be enabled separately
  * for this to take effect.
  *
  * @author Kohsuke Kawaguchi
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java
index c9b50c505ee..7a576af622c 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java
@@ -203,7 +203,7 @@ import java.text.SimpleDateFormat;
  *
  * 
                      VM-wide state
                      
  * 
                      
- * static is always there for you to use.
+ * {@code static} is always there for you to use.
  *
  *
  *
@@ -373,7 +373,7 @@ public interface Tube {
      * that you delegate to.
      * 
                      
      * For limited number of {@link Tube}s that do not maintain any
-     * thread unsafe resource, it is allowed to simply return this
+     * thread unsafe resource, it is allowed to simply return {@code this}
      * from this method (notice that even if you are stateless, if you
      * got a delegating {@link Tube} and that one isn't stateless, you
      * still have to copy yourself.)
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java
index bf81930ab16..1382660cc44 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java
@@ -42,7 +42,7 @@ import java.util.logging.Logger;
  * 
                      
  * To create a tubeline,
  * the JAX-WS runtime locates {@link TubelineAssemblerFactory}s through
- * the META-INF/services/com.sun.xml.internal.ws.api.pipe.TubelineAssemblerFactory files.
+ * the {@code META-INF/services/com.sun.xml.internal.ws.api.pipe.TubelineAssemblerFactory} files.
  * Factories found are checked to see if it supports the given binding ID one by one,
  * and the first valid {@link TubelineAssembler} returned will be used to create
  * a tubeline.
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java
index 914bf920e76..96571af35ba 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Container.java
@@ -50,12 +50,12 @@ import com.sun.xml.internal.ws.api.ComponentRegistry;
  * from a container, they can do the following:
  * 
                        
  *  
                      1. Negotiate an interface with the container and define it.
- *      (let's call it ContainerSecuritySPI.)
- *  
                      2. The container will implement ContainerSecuritySPI.
+ *      (let's call it {@code ContainerSecuritySPI}.)
+ *  
                      3. The container will implement {@code ContainerSecuritySPI}.
  *  
                      4. At the runtime, a security pipe gets
  *      {@link WSEndpoint} and then to {@link Container}.
- *  
                      5. It calls container.getSPI(ContainerSecuritySPI.class)
- *  
                      6. The container returns an instance of ContainerSecuritySPI.
+ *  
                      7. It calls {@code container.getSPI(ContainerSecuritySPI.class)}
+ *  
                      8. The container returns an instance of {@code ContainerSecuritySPI}.
  *  
                      9. The security pipe talks to the container through this SPI.
  * 
                      
  *
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java
index 5772cb3ef8b..278e1578897 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java
@@ -39,7 +39,7 @@ import java.lang.reflect.Method;
  * 
                      
  * Typical host of the JAX-WS RI would want to use
  * {@link InstanceResolver#createDefault(Class)} and then
- * use {@link InstanceResolver#createInvoker()} to obtain
+ * use {@link InstanceResolver#createInvoker()} to obtain
  * the default invoker implementation.
  *
  *
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java
index c9c6170aeb8..a5a764637ea 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java
@@ -63,7 +63,7 @@ public abstract class ServerPipelineHook {
      *      eventually processes messages.
      *
      * @return
-     *      The default implementation just returns tail, which means
+     *      The default implementation just returns {@code tail}, which means
      *      no additional pipe is inserted. If the implementation adds
      *      new pipes, return the new head pipe.
      */
@@ -89,7 +89,7 @@ public abstract class ServerPipelineHook {
      *      eventually processes messages.
      *
      * @return
-     *      The default implementation just returns tail, which means
+     *      The default implementation just returns {@code tail}, which means
      *      no additional pipe is inserted. If the implementation adds
      *      new pipes, return the new head pipe.
      */
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java
index fc7590d71a2..0e5d7abf3b6 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java
@@ -473,7 +473,7 @@ public abstract class WSEndpoint implements ComponentRegistry {
      * This method works like the following:
      * 
                        
      * 
                      1. {@link ServiceDefinition} is modeleed from the given SEI type.
-     * 
                      2. {@link Invoker} that always serves implementationObject will be used.
+     * 
                      3. {@link Invoker} that always serves {@code implementationObject} will be used.
      * 
                      
      * @param implType
      *      Endpoint class(not SEI). Enpoint class must have @WebService or @WebServiceProvider
@@ -521,7 +521,7 @@ public abstract class WSEndpoint implements ComponentRegistry {
      *      WSDL. Must be null if the {@code url} is null.
      * @param isTransportSynchronous
      *      If the caller knows that the returned {@link WSEndpoint} is going to be
-     *      used by a synchronous-only transport, then it may pass in true
+     *      used by a synchronous-only transport, then it may pass in {@code true}
      *      to allow the callee to perform an optimization based on that knowledge
      *      (since often synchronous version is cheaper than an asynchronous version.)
      *      This value is visible from {@link ServerTubeAssemblerContext#isSynchronous()}.
@@ -583,7 +583,7 @@ public abstract class WSEndpoint implements ComponentRegistry {
     }
 
     /**
-     * Deprecated version that assumes isTransportSynchronous==false
+     * Deprecated version that assumes {@code isTransportSynchronous==false}
      */
     @Deprecated
     public static  WSEndpoint create(
@@ -604,7 +604,7 @@ public abstract class WSEndpoint implements ComponentRegistry {
     /**
      * The same as
      * {@link #create(Class, boolean, Invoker, QName, QName, Container, WSBinding, SDDocumentSource, Collection, EntityResolver)}
-     * except that this version takes an url of the jax-ws-catalog.xml.
+     * except that this version takes an url of the {@code jax-ws-catalog.xml}.
      *
      * @param catalogUrl
      *      if not null, an {@link EntityResolver} is created from it and used.
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java
index e1cb4574530..c79e812ec77 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java
@@ -43,7 +43,7 @@ public abstract class WebModule extends Module {
      * this URI.
      *
      * 
                      
-     * This method follows the convention of the HttpServletRequest.getContextPath(),
+     * This method follows the convention of the {@code HttpServletRequest.getContextPath()},
      * and accepts strings like "http://myhost" (for web applications that are deployed
      * to the root context path), or "http://myhost/foobar" (for web applications
      * that are deployed to context path "/foobar")
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java
index 27375730c7e..9e8b47b9a4f 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java
@@ -135,7 +135,7 @@ import javax.xml.ws.WebServiceException;
  * 
                      
  * The JAX-WS RI locates the implementation of {@link WSDLParserExtension}s
  * by using the standard service look up mechanism, in particular looking for
- * META-INF/services/com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension
+ * {@code META-INF/services/com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension}
  *
  *
  * 
                      TODO
                      
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java
index 4671cdafcdf..6e883b7e28e 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/RequestContext.java
@@ -169,7 +169,7 @@ public final class RequestContext extends BaseDistributedPropertySet {
      *
      * 
                      
      * For outgoing messages, the transport may sends out this value.
-     * If this field is null, the transport may choose to send ""
+     * If this field is null, the transport may choose to send {@code ""}
      * (quoted empty string.)
      *
      * For incoming messages, the transport will set this field.
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java
index 8f7c918f03d..1e5883c7b15 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/Stub.java
@@ -188,7 +188,7 @@ public abstract class Stub implements WSBindingProvider, ResponseContextReceiver
      * @param epr                    To create a stub that sends out reference parameters
      *                               of a specific EPR, give that instance. Otherwise null.
      *                               Its address field will not be used, and that should be given
-     *                               separately as the defaultEndPointAddress.
+     *                               separately as the {@code defaultEndPointAddress}.
      */
     @Deprecated
     protected Stub(WSServiceDelegate owner, Tube master, BindingImpl binding, WSDLPort wsdlPort, EndpointAddress defaultEndPointAddress, @Nullable WSEndpointReference epr) {
@@ -205,7 +205,7 @@ public abstract class Stub implements WSBindingProvider, ResponseContextReceiver
      * @param epr                    To create a stub that sends out reference parameters
      *                               of a specific EPR, give that instance. Otherwise null.
      *                               Its address field will not be used, and that should be given
-     *                               separately as the defaultEndPointAddress.
+     *                               separately as the {@code defaultEndPointAddress}.
      */
     @Deprecated
     protected Stub(QName portname, WSServiceDelegate owner, Tube master, BindingImpl binding, WSDLPort wsdlPort, EndpointAddress defaultEndPointAddress, @Nullable WSEndpointReference epr) {
@@ -222,7 +222,7 @@ public abstract class Stub implements WSBindingProvider, ResponseContextReceiver
      * @param epr                    To create a stub that sends out reference parameters
      *                               of a specific EPR, give that instance. Otherwise null.
      *                               Its address field will not be used, and that should be given
-     *                               separately as the defaultEndPointAddress.
+     *                               separately as the {@code defaultEndPointAddress}.
      */
     protected Stub(WSPortInfo portInfo, BindingImpl binding, Tube master,EndpointAddress defaultEndPointAddress, @Nullable WSEndpointReference epr) {
          this((WSServiceDelegate) portInfo.getOwner(), master, portInfo, null, binding,portInfo.getPort(), defaultEndPointAddress, epr);
@@ -237,7 +237,7 @@ public abstract class Stub implements WSBindingProvider, ResponseContextReceiver
    * @param epr                    To create a stub that sends out reference parameters
    *                               of a specific EPR, give that instance. Otherwise null.
    *                               Its address field will not be used, and that should be given
-   *                               separately as the defaultEndPointAddress.
+   *                               separately as the {@code defaultEndPointAddress}.
    */
   protected Stub(WSPortInfo portInfo, BindingImpl binding, EndpointAddress defaultEndPointAddress, @Nullable WSEndpointReference epr) {
        this(portInfo,binding,null, defaultEndPointAddress,epr);
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java
index 2b384af2919..3c59fc65ab8 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java
@@ -341,8 +341,8 @@ public class WSServiceDelegate extends WSService {
     /**
      * Parses the WSDL and builds {@link com.sun.xml.internal.ws.api.model.wsdl.WSDLModel}.
      * @param wsdlDocumentLocation
-     *      Either this or wsdl parameter must be given.
-     *      Null location means the system won't be able to resolve relative references in the WSDL,
+     *      Either this or {@code wsdl} parameter must be given.
+     *      Null location means the system won't be able to resolve relative references in the WSDL.
      */
     private WSDLModel parseWSDL(URL wsdlDocumentLocation, Source wsdlSource, Class serviceClass) {
         try {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java
index eac81fe0138..27475004fc7 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java
@@ -57,14 +57,14 @@ public abstract class ValueSetter {
      * @param obj
      *      The unmarshalled object.
      * @param args
-     *      The arguments given to the Java method invocation. If obj
+     *      The arguments given to the Java method invocation. If {@code obj}
      *      is supposed to be returned as a {@link Holder} value, a suitable
-     *      {@link Holder} is obtained from this argument list and obj
+     *      {@link Holder} is obtained from this argument list and {@code obj}
      *      is set.
      *
      * @return
-     *      if obj is supposed to be returned as a return value
-     *      from the method, this method returns obj. Otherwise null.
+     *      if {@code obj} is supposed to be returned as a return value
+     *      from the method, this method returns {@code obj}. Otherwise null.
      */
     abstract Object put(Object obj, Object[] args);
 
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java
index 375844200e2..0c688266f67 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java
@@ -198,7 +198,7 @@ public final class Converter {
      * Wraps {@link javax.xml.stream.XMLStreamWriter} by an indentation engine if possible.
      *
      * 
                      
-     * We can do this only when we have stax-utils.jar in the class path.
+     * We can do this only when we have {@code stax-utils.jar} in the class path.
      */
     private static XMLStreamWriter createIndenter(XMLStreamWriter writer) {
         try {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java
index d25806ab75c..d790d0d9d83 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java
@@ -148,7 +148,7 @@ public interface JAXWSProperties {
     public static final String WSENDPOINT = "com.sun.xml.internal.ws.api.server.WSEndpoint";
 
     /**
-     * Gets the wsa:To header.
+     * Gets the {@code wsa:To} header.
      *
      * The propery value is available on incoming SOAP message. The type of the value
      * is {@link WSEndpointReference}.
@@ -160,7 +160,7 @@ public interface JAXWSProperties {
     public static final String ADDRESSING_TO = "com.sun.xml.internal.ws.api.addressing.to";
 
     /**
-     * Gets the wsa:From header.
+     * Gets the {@code wsa:From} header.
      *
      * The propery value is available on incoming SOAP message. The type of the value
      * is {@link WSEndpointReference}.
@@ -172,7 +172,7 @@ public interface JAXWSProperties {
     public static final String ADDRESSING_FROM = "com.sun.xml.internal.ws.api.addressing.from";
 
     /**
-     * Gets the wsa:Action header value.
+     * Gets the {@code wsa:Action} header value.
      *
      * The propery value is available on incoming SOAP message. The type of the value
      * is {@link String}.
@@ -184,7 +184,7 @@ public interface JAXWSProperties {
     public static final String ADDRESSING_ACTION = "com.sun.xml.internal.ws.api.addressing.action";
 
     /**
-     * Gets the wsa:MessageID header value.
+     * Gets the {@code wsa:MessageID} header value.
      *
      * The propery value is available on incoming SOAP message. The type of the value
      * is {@link String}.
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java
index 5a4294ba666..24ce9b19049 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java
@@ -128,7 +128,7 @@ public abstract class AbstractHeaderImpl implements Header {
     }
 
     /**
-     * Parses a string that looks like xs:boolean into boolean.
+     * Parses a string that looks like {@code xs:boolean} into boolean.
      *
      * This method assumes that the whilespace normalization has already taken place.
      */
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java
index 8d7891350b5..5c78d7143de 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java
@@ -186,7 +186,7 @@ public final class JAXBMessage extends AbstractMessageImpl implements StreamingS
      * Creates a {@link Message} backed by a JAXB bean.
      *
      * @param bridge
-     *      Specify the payload tag name and how jaxbObject is bound.
+     *      Specify the payload tag name and how {@code jaxbObject} is bound.
      * @param jaxbObject
      */
     public static Message create(XMLBridge bridge, Object jaxbObject, SOAPVersion soapVer) {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java
index 9444b67f193..aff6ede886e 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java
@@ -161,7 +161,7 @@ public class ParameterImpl implements Parameter {
     }
 
     /**
-     * @return true if this instanceof {@link WrapperParameter}.
+     * @return true if {@code this instanceof} {@link WrapperParameter}.
      */
     public boolean isWrapperStyle() {
         return false;
@@ -223,7 +223,7 @@ public class ParameterImpl implements Parameter {
      * 
                      
      * {@link JavaMethodImpl#getResponseParameters()} is guaranteed to have
      * at most one such {@link ParameterImpl}. Note that there coule be none,
-     * in which case the method returns void.
+     * in which case the method returns {@code void}.
      */
     public boolean isResponse() {
         return index == -1;
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java
index 975464e6eb9..7e58fbbfb86 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java
@@ -401,7 +401,7 @@ public final class PolicyUtils {
          * 
                      
          * 
                       This method transforms the name of the given service class into a
          * provider-configuration filename as described above and then uses the
-         * getResources method of the given class loader to find all
+         * {@code getResources} method of the given class loader to find all
          * available files with that name.  These files are then read and parsed to
          * produce a list of provider-class names. Eventually each provider class is
          * instantiated and array of those instances is returned.
@@ -412,7 +412,7 @@ public final class PolicyUtils {
          *
          * @param serviceClass The service's abstract service class. Must not be {@code null}.
          * @param loader  The class loader to be used to load provider-configuration files
-         *                and instantiate provider classes, or null if the system
+         *                and instantiate provider classes, or {@code null} if the system
          *                class loader (or, failing that the bootstrap class loader) is to
          *                be used
          * @throws NullPointerException in case {@code service} input parameter is {@code null}.
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java
index b797a1921b7..fcd7aab227f 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java
@@ -66,12 +66,12 @@ import java.util.TreeSet;
  * zero-argument constructor so that they may be instantiated during lookup.
  * 
                      
  * 
                       A service provider identifies itself by placing a provider-configuration
- * file in the resource directory META-INF/services.  The file's name
+ * file in the resource directory {@code META-INF/services}.  The file's name
  * should consist of the fully-qualified name of the abstract service class.
  * The file should contain a list of fully-qualified concrete provider-class
  * names, one per line.  Space and tab characters surrounding each name, as
- * well as blank lines, are ignored.  The comment character is '#'
- * (0x23); on each line all characters following the first comment
+ * well as blank lines, are ignored.  The comment character is {@code '#'}
+ * ({@code 0x23}); on each line all characters following the first comment
  * character are ignored.  The file must be encoded in UTF-8.
  * 
                      
  * 
                       If a particular concrete provider class is named in more than one
@@ -83,20 +83,20 @@ import java.util.TreeSet;
  * note that this is not necessarily the class loader that found the file.
  * 
                      
  * 
                       Example: Suppose we have a service class named
- * java.io.spi.CharCodec.  It has two abstract methods:
+ * {@code java.io.spi.CharCodec}.  It has two abstract methods:
  * 
                      
  * 
                        *   public abstract CharEncoder getEncoder(String encodingName);
  *   public abstract CharDecoder getDecoder(String encodingName);
  * 
                      
  * 
                      
- * Each method returns an appropriate object or null if it cannot
- * translate the given encoding.  Typical CharCodec providers will
+ * Each method returns an appropriate object or {@code null} if it cannot
+ * translate the given encoding.  Typical {@code CharCodec} providers will
  * support more than one encoding.
  * 
                      
- * 
                       If sun.io.StandardCodec is a provider of the CharCodec
+ * 
                       If {@code sun.io.StandardCodec} is a provider of the {@code CharCodec}
  * service then its jar file would contain the file
- * META-INF/services/java.io.spi.CharCodec.  This file would contain
+ * {@code META-INF/services/java.io.spi.CharCodec}.  This file would contain
  * the single line:
  * 
                      
  * 
                      @@ -139,7 +139,7 @@ final class ServiceFinder implements Iterable {
      * 
                      
      * 
                       This method transforms the name of the given service class into a
      * provider-configuration filename as described above and then uses the
-     * getResources method of the given class loader to find all
+     * {@code getResources} method of the given class loader to find all
      * available files with that name.  These files are then read and parsed to
      * produce a list of provider-class names.  The iterator that is returned
      * uses the given class loader to lookup and then instantiate each element
@@ -151,7 +151,7 @@ final class ServiceFinder implements Iterable {
      *
      * @param service The service's abstract service class
      * @param loader  The class loader to be used to load provider-configuration files
-     *                and instantiate provider classes, or null if the system
+     *                and instantiate provider classes, or {@code null} if the system
      *                class loader (or, failing that the bootstrap class loader) is to
      *                be used
      * @throws ServiceConfigurationError If a provider-configuration file violates the specified format
@@ -193,9 +193,9 @@ final class ServiceFinder implements Iterable {
     /**
      * Returns discovered objects incrementally.
      *
-     * @return An Iterator that yields provider objects for the given
+     * @return An {@code Iterator} that yields provider objects for the given
      *         service, in some arbitrary order.  The iterator will throw a
-     *         ServiceConfigurationError if a provider-configuration
+     *         {@code ServiceConfigurationError} if a provider-configuration
      *         file violates the specified format or if a provider class cannot
      *         be found and instantiated.
      */
@@ -284,8 +284,8 @@ final class ServiceFinder implements Iterable {
      * @param u        The URL naming the configuration file to be parsed
      * @param returned A Set containing the names of provider classes that have already
      *                 been returned.  This set will be updated to contain the names
-     *                 that will be yielded from the returned Iterator.
-     * @return A (possibly empty) Iterator that will yield the
+     *                 that will be yielded from the returned {@code Iterator}.
+     * @return A (possibly empty) {@code Iterator} that will yield the
      *         provider-class names in the given configuration file that are
      *         not yet members of the returned set
      * @throws ServiceConfigurationError If an I/O error occurs while reading from the given URL, or
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java
index 0e473eee3e9..eb47d0d7445 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java
@@ -299,7 +299,7 @@ public class PolicySourceModel implements Cloneable {
      * Every source model that references other policies must be expanded before it can be translated into a Policy objects. See
      * {@link #expand(PolicySourceModelContext)} and {@link #isExpanded()} for more details.
      *
-     * @return {@code true} or {code false} depending on whether this policy source model contains references to another policy source models.
+     * @return {@code true} or {@code false} depending on whether this policy source model contains references to another policy source models.
      */
     public boolean containsPolicyReferences() {
         return !references.isEmpty();
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java
index 65bee5a7a26..840276486e8 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java
@@ -53,10 +53,10 @@ public abstract class EndpointValueSetter {
      * @param obj
      *      The unmarshalled object.
      * @param args
-     *      The arguments that need to be given to the Java method invocation. If obj
-     *      is supposed to be returned as a {@link Holder} value, a suitable
-     *      {@link Holder} is obtained from this argument list and obj
-     *      is set.
+     *      The arguments that need to be given to the Java method invocation.
+     *      If {@code obj} is supposed to be returned as a {@link Holder}
+     *      value, a suitable {@link Holder} is obtained from
+     *      this argument list and {@code obj} is set.
      *
      */
     abstract void put(Object obj, Object[] args);
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java
index 94fcc0328e4..9207d946655 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingContext.java
@@ -257,7 +257,7 @@ public interface BindingContext {
 
     /**
      * The property that you can specify to {@link JAXBContext#newInstance}
-     * to allow unmarshaller to honor xsi:nil anywhere, even if they are
+     * to allow unmarshaller to honor {@code xsi:nil} anywhere, even if they are
      * not specifically allowed by the schema.
      *
      * @since 2.1.3
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java
index a69edb430a5..65f0603b10b 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java
@@ -69,7 +69,7 @@ public class BindingHelper {
      * Accordingly, this method may return an identifier that collides with reserved words.
      *
      * 
                      
-     * Use JJavaName.isJavaIdentifier(String) to check for such collision.
+     * Use {@code JJavaName.isJavaIdentifier(String)} to check for such collision.
      *
      * @return
      *      Typically, this method returns "nameLikeThis".
@@ -111,17 +111,17 @@ public class BindingHelper {
      *
      * 
                      
      * For example, given the following
-     * 
                      
+     * <pre>{@code
      * interface Foo<T> extends List<List<T>> {}
      * interface Bar extends Foo<String> {}
-     * 
                      
+     * }
                      
      * This method works like this:
-     * 
                      
+     * <pre>{@code
      * getBaseClass( Bar, List ) = List<List<String>
      * getBaseClass( Bar, Foo  ) = Foo<String>
      * getBaseClass( Foo<? extends Number>, Collection ) = Collection<List<? extends Number>>
      * getBaseClass( ArrayList<? extends BigInteger>, List ) = List<? extends BigInteger>
-     * 
                      
+     * }
      *
      * @param type
      *      The type that derives from {@code baseType}
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java
index 604f7d5791d..54a6857902d 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java
@@ -87,7 +87,7 @@ public abstract class WSHTTPConnection extends BasePropertySet {
      * 
                      
      * This parameter is usually exposed to {@link WebServiceContext}
      * as {@link Packet#OUTBOUND_TRANSPORT_HEADERS}, and thus it
-     * should ignore Content-Type and Content-Length headers.
+     * should ignore {@code Content-Type} and {@code Content-Length} headers.
      *
      * @param headers
      *      See {@link HttpURLConnection#getHeaderFields()} for the format.
@@ -105,7 +105,7 @@ public abstract class WSHTTPConnection extends BasePropertySet {
     public abstract void setResponseHeader(String key, List value);
 
     /**
-     * Sets the "Content-Type" header.
+     * Sets the {@code "Content-Type"} header.
      *
      * 
                      
      * If the Content-Type header has already been set, this method will overwrite
@@ -116,8 +116,8 @@ public abstract class WSHTTPConnection extends BasePropertySet {
      * may be invoked in any arbitrary order.
      *
      * @param value
-     *      strings like "application/xml; charset=UTF-8" or
-     *      "image/jpeg".
+     *      strings like {@code "application/xml; charset=UTF-8"} or
+     *      {@code "image/jpeg"}.
      */
     public abstract void setContentTypeResponseHeader(@NotNull String value);
 
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java
index fec08192cc3..be42c6d2674 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java
@@ -69,7 +69,7 @@ public final class ServerAdapter extends HttpAdapter implements BoundEndpoint {
     }
 
     /**
-     * Gets the name of the endpoint as given in the sun-jaxws.xml
+     * Gets the name of the endpoint as given in the {@code sun-jaxws.xml}
      * deployment descriptor.
      */
     public String getName() {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java
index 5f45d63d681..9c4eb6cb74f 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/QNameMap.java
@@ -128,12 +128,12 @@ public final class QNameMap {
 
     /**
      * Returns the value to which the specified keys are mapped in this QNameMap,
-     * or null if the map contains no mapping for this key.
+     * or {@code null} if the map contains no mapping for this key.
      *
      * @param   nsUri the namespaceUri key whose associated value is to be returned.
      * @param   localPart the localPart key whose associated value is to be returned.
      * @return  the value to which this map maps the specified set of keya, or
-     *          null if the map contains no mapping for this set of keys.
+     *          {@code null} if the map contains no mapping for this set of keys.
      * @see #put(String,String, Object)
      */
     public V get( @NotNull String nsUri, String localPart ) {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java
index 519d8df5e7f..bae830f73df 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java
@@ -76,12 +76,12 @@ import java.util.concurrent.ConcurrentHashMap;
  * zero-argument constructor so that they may be instantiated during lookup.
  * 
                      
  * 
                       A service provider identifies itself by placing a provider-configuration
- * file in the resource directory META-INF/services.  The file's name
+ * file in the resource directory {@code META-INF/services}.  The file's name
  * should consist of the fully-qualified name of the abstract service class.
  * The file should contain a list of fully-qualified concrete provider-class
  * names, one per line.  Space and tab characters surrounding each name, as
- * well as blank lines, are ignored.  The comment character is '#'
- * (0x23); on each line all characters following the first comment
+ * well as blank lines, are ignored.  The comment character is {@code '#'}
+ * ({@code 0x23}); on each line all characters following the first comment
  * character are ignored.  The file must be encoded in UTF-8.
  * 
                      
  * 
                       If a particular concrete provider class is named in more than one
@@ -93,20 +93,20 @@ import java.util.concurrent.ConcurrentHashMap;
  * note that this is not necessarily the class loader that found the file.
  * 
                      
  * 
                       Example: Suppose we have a service class named
- * java.io.spi.CharCodec.  It has two abstract methods:
+ * {@code java.io.spi.CharCodec}.  It has two abstract methods:
  * 
                      
  * 
                        *   public abstract CharEncoder getEncoder(String encodingName);
  *   public abstract CharDecoder getDecoder(String encodingName);
  * 
                      
  * 
                      
- * Each method returns an appropriate object or null if it cannot
- * translate the given encoding.  Typical CharCodec providers will
+ * Each method returns an appropriate object or {@code null} if it cannot
+ * translate the given encoding.  Typical {@code CharCodec} providers will
  * support more than one encoding.
  * 
                      
- * 
                       If sun.io.StandardCodec is a provider of the CharCodec
+ * 
                       If {@code sun.io.StandardCodec} is a provider of the {@code CharCodec}
  * service then its jar file would contain the file
- * META-INF/services/java.io.spi.CharCodec.  This file would contain
+ * {@code META-INF/services/java.io.spi.CharCodec}.  This file would contain
  * the single line:
  * 
                      
  * 
                      @@ -169,7 +169,7 @@ public final class ServiceFinder implements Iterable {
      * 
                      
      * 
                       This method transforms the name of the given service class into a
      * provider-configuration filename as described above and then uses the
-     * getResources method of the given class loader to find all
+     * {@code getResources} method of the given class loader to find all
      * available files with that name.  These files are then read and parsed to
      * produce a list of provider-class names.  The iterator that is returned
      * uses the given class loader to lookup and then instantiate each element
@@ -181,7 +181,7 @@ public final class ServiceFinder implements Iterable {
      *
      * @param service The service's abstract service class
      * @param loader  The class loader to be used to load provider-configuration files
-     *                and instantiate provider classes, or null if the system
+     *                and instantiate provider classes, or {@code null} if the system
      *                class loader (or, failing that the bootstrap class loader) is to
      *                be used
      * @throws ServiceConfigurationError If a provider-configuration file violates the specified format
@@ -227,9 +227,9 @@ public final class ServiceFinder implements Iterable {
     /**
      * Returns discovered objects incrementally.
      *
-     * @return An Iterator that yields provider objects for the given
+     * @return An {@code Iterator} that yields provider objects for the given
      *         service, in some arbitrary order.  The iterator will throw a
-     *         ServiceConfigurationError if a provider-configuration
+     *         {@code ServiceConfigurationError} if a provider-configuration
      *         file violates the specified format or if a provider class cannot
      *         be found and instantiated.
      */
@@ -319,8 +319,8 @@ public final class ServiceFinder implements Iterable {
      * @param u        The URL naming the configuration file to be parsed
      * @param returned A Set containing the names of provider classes that have already
      *                 been returned.  This set will be updated to contain the names
-     *                 that will be yielded from the returned Iterator.
-     * @return A (possibly empty) Iterator that will yield the
+     *                 that will be yielded from the returned {@code Iterator}.
+     * @return A (possibly empty) {@code Iterator} that will yield the
      *         provider-class names in the given configuration file that are
      *         not yet members of the returned set
      * @throws ServiceConfigurationError If an I/O error occurs while reading from the given URL, or
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java
index d95e56c23ac..5e5f1074eb2 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java
@@ -119,7 +119,7 @@ public class DumpTube extends AbstractFilterTubeImpl {
      * Wraps {@link XMLStreamWriter} by an indentation engine if possible.
      *
      * 
                      
-     * We can do this only when we have stax-utils.jar in the classpath.
+     * We can do this only when we have {@code stax-utils.jar} in the classpath.
      */
     private XMLStreamWriter createIndenter(XMLStreamWriter writer) {
         try {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java
index 2fb01c79cd6..6a96fd76672 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java
@@ -139,7 +139,7 @@ public class RuntimeWSDLParser {
      * then as last option, if the wsdlLoc has no '?wsdl' as query parameter then it is tried by appending '?wsdl'.
      *
      * @param wsdlLoc
-     *      Either this or wsdl parameter must be given.
+     *      Either this or {@code wsdl} parameter must be given.
      *      Null location means the system won't be able to resolve relative references in the WSDL,
      */
     public static WSDLModel parse(@Nullable URL wsdlLoc, @NotNull Source wsdlSource, @NotNull EntityResolver resolver,
@@ -154,7 +154,7 @@ public class RuntimeWSDLParser {
      * then as last option, if the wsdlLoc has no '?wsdl' as query parameter then it is tried by appending '?wsdl'.
      *
      * @param wsdlLoc
-     *      Either this or wsdl parameter must be given.
+     *      Either this or {@code wsdl} parameter must be given.
      *      Null location means the system won't be able to resolve relative references in the WSDL,
      */
     public static WSDLModel parse(@Nullable URL wsdlLoc, @NotNull Source wsdlSource, @NotNull EntityResolver resolver,
@@ -169,7 +169,7 @@ public class RuntimeWSDLParser {
      * then as last option, if the wsdlLoc has no '?wsdl' as query parameter then it is tried by appending '?wsdl'.
      *
      * @param wsdlLoc
-     *      Either this or wsdl parameter must be given.
+     *      Either this or {@code wsdl} parameter must be given.
      *      Null location means the system won't be able to resolve relative references in the WSDL,
      */
     public static WSDLModel parse(@Nullable URL wsdlLoc, @NotNull Source wsdlSource, @NotNull EntityResolver resolver,
@@ -184,7 +184,7 @@ public class RuntimeWSDLParser {
      * then as last option, if the wsdlLoc has no '?wsdl' as query parameter then it is tried by appending '?wsdl'.
      *
      * @param wsdlLoc
-     *      Either this or wsdl parameter must be given.
+     *      Either this or {@code wsdl} parameter must be given.
      *      Null location means the system won't be able to resolve relative references in the WSDL,
      */
     public static WSDLModel parse(@Nullable URL wsdlLoc, @NotNull Source wsdlSource, @NotNull EntityResolver resolver,
@@ -200,7 +200,7 @@ public class RuntimeWSDLParser {
      * then as last option, if the wsdlLoc has no '?wsdl' as query parameter then it is tried by appending '?wsdl'.
      *
      * @param wsdlLoc
-     *      Either this or wsdl parameter must be given.
+     *      Either this or {@code wsdl} parameter must be given.
      *      Null location means the system won't be able to resolve relative references in the WSDL,
      */
     public static WSDLModel parse(@Nullable URL wsdlLoc, @NotNull Source wsdlSource, @NotNull EntityResolver resolver,
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java
index 703b37d8738..5d76bf0d289 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java
@@ -141,7 +141,7 @@ public class SOAPException extends Exception {
      * @param  cause the {@code Throwable} object that caused this
      *         {@code SOAPException} object to be thrown.  The value of this
      *         parameter is saved for later retrieval by the
-     *         {@link #getCause()} method.  A null value is
+     *         {@link #getCause()} method.  A {@code null} value is
      *         permitted and indicates that the cause is nonexistent or
      *         unknown.
      * @return  a reference to this {@code SOAPException} instance
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java
index c0e07eb9989..00dfde790a1 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceException.java
@@ -62,13 +62,14 @@ public class WebServiceException extends java.lang.RuntimeException {
   }
 
   /** Constructs a new WebServiceException with the specified cause
-   *  and a detail message of (cause==null ? null :
-   *  cause.toString()) (which typically contains the
-   *  class and detail message of cause).
+   *  and a detail message of
+   *  {@code (cause==null ? null : cause.toString())}
+   *  (which typically contains the
+   *  class and detail message of {@code cause}).
    *
    *  @param cause   The cause which is saved for the later
    *                 retrieval throw by the getCause method.
-   *                 (A null value is permitted, and
+   *                 (A {@code null} value is permitted, and
    *                 indicates that the cause is nonexistent or
      *               unknown.)
   **/
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java
index ed55203e06f..77222f0b564 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpExchange.java
@@ -259,7 +259,7 @@ public abstract class HttpExchange {
      *         It is the path that comes
      *         after the web service path but before the query string in the
      *         request URI
-     *         null if there is no extra path in the request URI
+     *         {@code null} if there is no extra path in the request URI
      */
     public abstract String getPathInfo();
 
@@ -271,7 +271,7 @@ public abstract class HttpExchange {
      * This can be used for {@link MessageContext#QUERY_STRING}
      *
      * @return undecoded query string of request URI, or
-     *         null if the request URI doesn't have one
+     *         {@code null} if the request URI doesn't have one
      */
     public abstract String getQueryString();
 
@@ -292,7 +292,7 @@ public abstract class HttpExchange {
      * be exposed using {@link #REQUEST_X509CERTIFICATE}
      *
      * @param name attribute name
-     * @return the attribute value, or null if the attribute doesn't
+     * @return the attribute value, or {@code null} if the attribute doesn't
      *         exist
      */
     public abstract Object getAttribute(String name);
@@ -311,7 +311,7 @@ public abstract class HttpExchange {
      * user for this {@code HttpExchange}.
      *
      * @return Principal for an authenticated user, or
-     *         null if not authenticated
+     *         {@code null} if not authenticated
      */
     public abstract Principal getUserPrincipal();
 
@@ -320,7 +320,7 @@ public abstract class HttpExchange {
      * logical "role".
      *
      * @param role specifies the name of the role
-     * @return true if the user making this request belongs to a
+     * @return {@code true} if the user making this request belongs to a
      *         given role
      */
     public abstract boolean isUserInRole(String role);
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java
index 855d2a4c264..58e515ee9d1 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClass.java
@@ -51,7 +51,7 @@ public abstract class JClass extends JType
      * @return
      *  name of this class, without any qualification.
      *  For example, this method returns "String" for
-     *  java.lang.String.
+     *  {@code java.lang.String}.
      */
     abstract public String name();
 
@@ -62,7 +62,7 @@ public abstract class JClass extends JType
     abstract public JPackage _package();
 
     /**
-     * Returns the class in which this class is nested, or null if
+     * Returns the class in which this class is nested, or {@code null} if
      * this is a top-level class.
      */
     public JClass outer() {
@@ -102,7 +102,7 @@ public abstract class JClass extends JType
      *
      * 
                      
      * For example, if this {@link JClass} represents
-     * Set<T>, this method returns an array
+     * {@code Set}, this method returns an array
      * that contains single {@link JTypeVar} for 'T'.
      */
     public JTypeVar[] typeParams() {
@@ -134,7 +134,7 @@ public abstract class JClass extends JType
     /**
      * @deprecated calling this method from {@link JClass}
      * would be meaningless, since it's always guaranteed to
-     * return this.
+     * return {@code this}.
      */
     public JClass boxify() { return this; }
 
@@ -184,17 +184,17 @@ public abstract class JClass extends JType
      *
      * 
                      
      * For example, given the following
-     * 
                      
+     * <pre>{@code
      * interface Foo<T> extends List<List<T>> {}
      * interface Bar extends Foo<String> {}
-     * 
                      
+     * }
                      
      * This method works like this:
-     * 
                      
+     * <pre>{@code
      * getBaseClass( Bar, List ) = List<List<String>
      * getBaseClass( Bar, Foo  ) = Foo<String>
      * getBaseClass( Foo<? extends Number>, Collection ) = Collection<List<? extends Number>>
      * getBaseClass( ArrayList<? extends BigInteger>, List ) = List<? extends BigInteger>
-     * 
                      
+     * }
      *
      * @param baseType
      *      The class whose parameterization we are interested in.
@@ -241,7 +241,7 @@ public abstract class JClass extends JType
      * a type argument.
      *
      * 
                      
-     * .narrow(X) builds Set<X> from Set.
+     * {@code .narrow(X)} builds {@code Set} from {@code Set}.
      */
     public JClass narrow( Class clazz ) {
         return narrow(owner().ref(clazz));
@@ -259,7 +259,7 @@ public abstract class JClass extends JType
      * a type argument.
      *
      * 
                      
-     * .narrow(X) builds Set<X> from Set.
+     * {@code .narrow(X)} builds {@code Set} from {@code Set}.
      */
     public JClass narrow( JClass clazz ) {
         return new JNarrowedClass(this,clazz);
@@ -307,7 +307,7 @@ public abstract class JClass extends JType
      * For example, when this class is Map<String,Map<V>>,
      * (where V then doing
      * substituteParams( V, Integer ) returns a {@link JClass}
-     * for Map<String,Map<Integer>>.
+     * for {@code Map>}.
      *
      * 
                      
      * This method needs to work recursively.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java
index 3ab5b060eb2..0b05bc8bcfb 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JClassContainer.java
@@ -129,7 +129,7 @@ public interface JClassContainer {
      * Gets the nearest package parent.
      *
      * 
                      
-     * If this.isPackage(), then return this.
+     * If {@code this.isPackage()}, then return {@code this}.
      */
     public JPackage getPackage();
 
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java
index 99709f60f5c..521cadbb25c 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JCodeModel.java
@@ -59,7 +59,7 @@ import com.sun.codemodel.internal.writer.ProgressCodeWriter;
  *
  * 
                      
  * Every CodeModel node is always owned by one {@link JCodeModel} object
- * at any given time (which can be often accesesd by the owner() method.)
+ * at any given time (which can be often accesesd by the {@code owner()} method.)
  *
  * As such, when you generate Java code, most of the operation works
  * in a top-down fashion. For example, you create a class from {@link JCodeModel},
@@ -635,7 +635,7 @@ public final class JCodeModel {
 
     /**
      * Conversion from primitive type {@link Class} (such as {@link Integer#TYPE}
-     * to its boxed type (such as Integer.class)
+     * to its boxed type (such as {@code Integer.class})
      */
     public static final Map,Class> primitiveToBox;
     /**
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java
index aad125a8d38..b059ec8fed3 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JConditional.java
@@ -76,7 +76,7 @@ public class JConditional implements JStatement {
     }
 
     /**
-     * Creates ... else if(...) ... code.
+     * Creates {@code ... else if(...) ...} code.
      */
     public JConditional _elseif(JExpression boolExp) {
         return _else()._if(boolExp);
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java
index 2c02305c37a..325800bcfa7 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpression.java
@@ -39,7 +39,7 @@ package com.sun.codemodel.internal;
  * which returns a complicated expression (by often taking other {@link JExpression}s
  * as parameters.
  * For example, you can build "5+2" by
- * JExpr.lit(5).add(JExpr.lit(2))
+ * {@code JExpr.lit(5).add(JExpr.lit(2))}
  */
 public interface JExpression extends JGenerable {
     /**
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java
index ee684fb7b2a..53e097b451c 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JExpressionImpl.java
@@ -40,7 +40,7 @@ public abstract class JExpressionImpl implements JExpression
     }
 
     /**
-     * Logical not '!x'.
+     * Logical not {@code '!x'}.
      */
     public final JExpression not() {
         return JOp.not(this);
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java
index 8eb136bcc3f..b2753955983 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JOp.java
@@ -77,7 +77,7 @@ abstract public class JOp {
     }
 
     /**
-     * Logical not '!x'.
+     * Logical not {@code '!x'}.
      */
     public static JExpression not(JExpression e) {
         if (e == JExpr.TRUE) return JExpr.FALSE;
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java
index e91612722dd..addf99dc811 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JPrimitiveType.java
@@ -81,7 +81,7 @@ public final class JPrimitiveType extends JType {
     /**
      * @deprecated calling this method from {@link JPrimitiveType}
      * would be meaningless, since it's always guaranteed to
-     * return this.
+     * return {@code this}.
      */
     public JType unboxify() {
         return this;
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java
index bba6ae78706..64398686cab 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JType.java
@@ -116,7 +116,8 @@ public abstract class JType implements JGenerable, Comparable {
     }
 
     /**
-     * If this class is a primitive type, return the boxed class. Otherwise return this.
+     * If this class is a primitive type, return the boxed class.
+     * Otherwise return {@code this}.
      *
      * 
                      
      * For example, for "int", this method returns "java.lang.Integer".
@@ -125,7 +126,7 @@ public abstract class JType implements JGenerable, Comparable {
 
     /**
      * If this class is a wrapper type for a primitive, return the primitive type.
-     * Otherwise return this.
+     * Otherwise return {@code this}.
      *
      * 
                      
      * For example, for "java.lang.Integer", this method returns "int".
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java
index 5ed042edd59..d62177b5e5a 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java
@@ -57,9 +57,9 @@ import java.util.logging.Logger;
  *     +- X.class
  * 
  * 
                      
- * {@link ParallelWorldClassLoader}("foo/") would load X.class from
- * /foo/X.class (note that X is defined in the root package, not
- * foo.X.
+ * {@link ParallelWorldClassLoader}("foo/") would load {@code X.class} from
+ * {@code /foo/X.class} (note that X is defined in the root package, not
+ * {@code foo.X}.
  *
  * 
                      
  * This can be combined with  {@link MaskingClassLoader} to mask classes which are loaded by the parent
@@ -77,11 +77,13 @@ import java.util.logging.Logger;
  *        +- X.class
  * 
  * 
                      
- * {@link ParallelWorldClassLoader}(MaskingClassLoader.class.getClassLoader()) would load foo.X.class from
- * /bar/foo.X.class not the foo.X.class in the publicly visible place in the jar file, thus
- * masking the parent classLoader from loading the class from  foo.X.class
+ * {@link ParallelWorldClassLoader}(MaskingClassLoader.class.getClassLoader())
+ * would load {@code foo.X.class}  from
+ * {@code /bar/foo.X.class} not the {@code foo.X.class}
+ * in the publicly visible place in the jar file, thus
+ * masking the parent classLoader from loading the class from {@code foo.X.class}
  * (note that X is defined in the  package foo, not
- * bar.foo.X.
+ * {@code bar.foo.X}.
  *
  * @author Kohsuke Kawaguchi
  */
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java
index 6a3eec71d50..85352f9fdd0 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java
@@ -182,8 +182,8 @@ public class SchemaGenerator {
     }
 
     /**
-     * Computes the file system path of jaxb-api.jar so that
-     * Annotation Processing will see them in the -cp option.
+     * Computes the file system path of {@code jaxb-api.jar} so that
+     * Annotation Processing will see them in the {@code -cp} option.
      *
      * 
                      
      * In Java, you can't do this reliably (for that matter there's no guarantee
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java
index 3d7fd96e0fa..f5fbba72201 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java
@@ -74,14 +74,14 @@ public abstract class NGCCInterleaveFilter implements NGCCEventSource, NGCCEvent
 //
     /**
      * Receiver that is being locked and therefore receives all the events.
-     * 
                      
+     * <pre>{@code
      * <interleave>
      *   <element name="foo"/>
      *   <element name="bar">
      *     <element name="foo"/>
      *   </element>
      * </interlaeve>
-     * 
                      
+     * }
      * When processing inside the bar element, this receiver is
      * "locked" so that it can correctly receive its child foo element.
      */
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java
index d3f04ab8e57..f5de62df10d 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java
@@ -165,28 +165,28 @@ public class NGCCRuntime implements ContentHandler, NGCCEventSource {
      * Whitespace handling is a tricky business. Consider the following
      * schema fragment:
      *
-     * 
+     * <pre>{@code
      * <element name="foo">
      *   <choice>
      *     <element name="bar"><empty/></element>
      *     <text/>
      *   </choice>
      * </element>
-     * 
+     * }
      *
      * Assume we hit the following instance:
-     * 
+     * <pre>{@code
      * <foo> <bar/></foo>
-     * 
+     * }
      *
      * Then this first space needs to be ignored (for otherwise, we will
      * end up treating this space as the match to <text/> and won't
      * be able to process <bar>.)
      *
      * Now assume the following instance:
-     * 
+     * <pre>{@code
      * <foo/>
-     * 
+     * }
      *
      * This time, we need to treat this empty string as a text, for
      * otherwise we won't be able to accept this instance.
@@ -483,16 +483,16 @@ public class NGCCRuntime implements ContentHandler, NGCCEventSource {
      * the top of the effective bindings. Because of the
      * timing difference between the startPrefixMapping method
      * and the execution of the corresponding actions,
-     * this value can be different from namespaces.size().
+     * this value can be different from {@code namespaces.size()}.
      * 
                      
      * For example, consider the following schema:
-     * 
                      
+     * <pre>{@code
      *  <oneOrMore>
      *   <element name="foo"><empty/></element>
      *  </oneOrMore>
      *  code fragment X
      *  <element name="bob"/>
-     * 
                      
+     * }
      * Code fragment X is executed after we see a startElement event,
      * but at this time the namespaces variable already include new
      * namespace bindings declared on "bob".
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java
index 275dfd70ced..e907fc5ec01 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java
@@ -145,8 +145,8 @@ public class Options
 
     /**
      * this switch determines how carefully the compiler will follow
-     * the compatibility rules in the spec. Either STRICT
-     * or EXTENSION.
+     * the compatibility rules in the spec. Either {@code STRICT}
+     * or {@code EXTENSION}.
      */
     public int compatibilityMode = STRICT;
 
@@ -187,7 +187,7 @@ public class Options
     public EntityResolver entityResolver = null;
 
     /**
-     * Type of input schema language. One of the SCHEMA_XXX
+     * Type of input schema language. One of the {@code SCHEMA_XXX}
      * constants.
      */
     private Language schemaLanguage = null;
@@ -466,7 +466,7 @@ public class Options
 
 
     /**
-     * Parses an option args[i] and return
+     * Parses an option {@code args[i]} and return
      * the number of tokens consumed.
      *
      * @return
@@ -842,7 +842,7 @@ public class Options
     }
 
     /**
-     * Finds the META-INF/sun-jaxb.episode file to add as a binding customization.
+     * Finds the {@code META-INF/sun-jaxb.episode} file to add as a binding customization.
      */
     public void scanEpisodeFile(File jar) throws BadCommandLineException {
         try {
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java
index 2c698e749d2..1accddd381c 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java
@@ -59,10 +59,10 @@ public interface JavaCompiler {
      * @param additionalElementDecls
      *      Add element declarations for the specified element names to
      *      the XML types mapped from the corresponding {@link Reference}s.
-     *      Those {@link Reference}s must be included in the rootTypes parameter.
+     *      Those {@link Reference}s must be included in the {@code rootTypes} parameter.
      *      In this map, a {@link Reference} can be null, in which case the element name is
      *      declared to have an empty complex type.
-     *      (<xs:element name='foo'><xs:complexType/></xs:element>)
+     *      ({@code })
      *      This parameter can be null, in which case the method behaves as if the empty map is given.
      *
      * @param defaultNamespaceRemap
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
index f2eb3a474b9..65821b53a6d 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
@@ -54,7 +54,7 @@ public interface S2JJAXBModel extends JAXBModel {
     Mapping get( QName elementName );
 
     /**
-     * Gets all the ObjectFactory classes generated by the compilation.
+     * Gets all the {@code ObjectFactory} classes generated by the compilation.
      *
      * 
                      
      * This should be used for generating {@link XmlSeeAlso} on the SEI.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java
index 26b7e3480be..1a87f758f51 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java
@@ -57,7 +57,7 @@ import org.xml.sax.InputSource;
  * 
                      
  * The caller can feed the following synthesized schema
  * to achive the namespace URI -> Java package customization:
- * 
                      
+ * <pre>{@code
  * <schema targetNamespace="xml.namespace.uri"
  *   xmlns="http://www.w3.org/2001/XMLSchema"
  *   xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
@@ -68,7 +68,7 @@ import org.xml.sax.InputSource;
  *     </jaxb:schemaBindings>
  *   </appinfo></annotation>
  * </schema>
- * 
                      
+ * }
  * Feed this synthesized schema document for each namespace URI
  * you need to map.
  *
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java
index fddd7ca1b95..829f7c82142 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java
@@ -234,8 +234,8 @@ public abstract class CPropertyInfo implements PropertyInfo, CCust
      * 
                      
      * In general, a property often has to be capable of representing null
      * to indicate the absence of the value. This requires properties
-     * to be generated as @XmlElement Float f, not as
-     * @XmlElement float f;. But this is slow.
+     * to be generated as {@code @XmlElement Float f}, not as
+     * {@code @XmlElement float f;}. But this is slow.
      *
      * 
                      
      * Fortunately, there are cases where we know that the property can
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java
index 37ab1e13aec..4bb930a5ea0 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java
@@ -88,7 +88,7 @@ public interface TypeUse {
      * Creates a constant for the given lexical value.
      *
      * 
                      
-     * For example, to create a constant 1 for xs:int, you'd do:
+     * For example, to create a constant 1 for {@code xs:int}, you'd do:
      * 
                            * CBuiltinLeafInfo.INT.createConstant( codeModel, "1", null );
      * 
                      
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java
index 354121cd4a6..df96c68c69c 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java
@@ -98,7 +98,7 @@ public interface FieldAccessor {
     FieldOutline owner();
 
     /**
-     * Short for owner().getPropertyInfo()
+     * Short for {@code owner().getPropertyInfo()}
      */
     CPropertyInfo getPropertyInfo();
 }
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java
index 30d23dcf462..9308474848f 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java
@@ -35,12 +35,12 @@ import java.util.Set;
 public abstract class Expression {
 
     /**
-     * Computes LAST(exp)
+     * Computes {@code LAST(exp)}
      */
     abstract ElementSet lastSet();
 
     /**
-     * True of \epsilon \in L(exp)
+     * True of {@code \epsilon \in L(exp)}
      */
     abstract boolean isNullable();
 
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
index 697e0c3e0d0..81898b49939 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
@@ -37,13 +37,13 @@ import org.xml.sax.helpers.XMLFilterImpl;
 
 /**
  * {@link XMLReader} filter for supporting
- * http://xml.org/sax/features/namespace-prefixes feature.
+ * {@code http://xml.org/sax/features/namespace-prefixes} feature.
  *
  * @author Kohsuke Kawaguchi
  */
 final class ContentHandlerNamespacePrefixAdapter extends XMLFilterImpl {
     /**
-     * True if http://xml.org/sax/features/namespace-prefixes is set to true.
+     * True if {@code http://xml.org/sax/features/namespace-prefixes} is set to true.
      */
     private boolean namespacePrefixes = false;
 
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java
index ed51fee6ca0..c8de19908c2 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java
@@ -72,10 +72,10 @@ public final class SCDBasedBindingSet {
         /**
          * SCDs can be specified via multiple steps, like:
          *
-         * 
+         * <pre>{@code
          * <bindings scd="foo/bar">
          *   <bindings scd="zot/xyz">
-         * 
+         * }
          *
          * This field and {@link #nextSibling} form a single-linked list that
          * represent the children that shall be evaluated within this target.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java
index 387ffb9aa28..86687477c3a 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java
@@ -281,7 +281,7 @@ public final class ClassSelector extends BindingComponent {
      *      the binding of the body will be done later, to avoid
      *      cyclic binding problem.
      * @param referer
-     *      The component that refers to sc. This can be null,
+     *      The component that refers to {@code sc}. This can be null,
      *      if figuring out the referer is too hard, in which case
      *      the error message might be less user friendly.
      */
@@ -423,7 +423,7 @@ public final class ClassSelector extends BindingComponent {
 
 
     /**
-     * Set of package names that are tested (set of Strings.)
+     * Set of package names that are tested (set of {@code String}s.)
      *
      * This set is used to avoid duplicating "incorrect package name"
      * errors.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
index de04c7ea1af..09cc0436b05 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
@@ -36,7 +36,7 @@ import com.sun.xml.internal.xsom.XSWildcard;
 final class GWildcardElement extends GElement {
 
     /**
-     * If true, bind to Object for eager JAXB unmarshalling.
+     * If true, bind to {@code Object} for eager JAXB unmarshalling.
      * Otherwise bind to DOM (I hate "you can put both" semantics,
      * so I'm not going to do that in this binding mode.)
      */
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
index 52e156f2c08..0b3e2019073 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
@@ -65,7 +65,8 @@ import com.sun.xml.internal.xsom.visitor.XSVisitor;
  *
  * 
                      
  * Since we scan the whole content tree, we use this to check for unused
- * xmime:expectedContentTypes attributes. TODO: if we find this kind of error checks more
+ * {@code xmime:expectedContentTypes} attributes.
+ * TODO: if we find this kind of error checks more
  * common, use the visitors so that we don't have to mix everything in one class.
  *
  * @author
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java
index 02350e75adb..b35e61c6588 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java
@@ -36,7 +36,7 @@ import com.sun.tools.internal.xjc.reader.Const;
 import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
 
 /**
- * Controls the ObjectFactory method name.
+ * Controls the {@code ObjectFactory} method name.
  *
  * @author Kohsuke Kawaguchi
  */
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
index 060502453e9..10cf27d19b2 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
@@ -454,9 +454,9 @@ public final class BIGlobalBinding extends AbstractDeclarationImpl {
 
     /**
      * Used to unmarshal
-     * 
                      
+     * <pre>{@code
      * <[element] name="className" />
-     * 
+     * }
      */
     static final class ClassNameBean {
         @XmlAttribute(required=true)
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
index 070cd747327..5a08d346c82 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
@@ -29,7 +29,7 @@ import javax.xml.bind.DatatypeConverter;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
 /**
- * Serializes boolean as 0 or 1.
+ * Serializes {@code boolean} as 0 or 1.
  *
  * @author Kohsuke Kawaguchi
  * @since 2.0
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java
index 77227f90123..b1f360f9f68 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java
@@ -111,13 +111,13 @@ public interface SchemaBuilder<
      * @param parent
      *      The parent scope. null if there's no parent scope.
      *      For example, if the complete document looks like the following:
-     *      
                      
+     *      <pre>{@code
      *      <grammar>
      *        <start><element name="root"><empty/></element></start>
      *      </grammar>
-     *      
                      
+     *      }
      *      Then when the outer-most {@link Grammar} is created, it will
-     *      receive the null parent.
+     *      receive the {@code null} parent.
      */
     Grammar makeGrammar(Scope parent);
 
@@ -126,12 +126,12 @@ public interface SchemaBuilder<
      *
      * such as,
      *
-     * 
                      
+     * <pre>{@code
      * <element name="foo">     <!-- this becomes 'P' -->
      *   <foreign:annotation /> <!-- this becomes 'A' -->
      *   ...
      * </element>
-     * 
                      
+     * }
      */
     P annotate(P p, A anno) throws BuildException;
 
@@ -140,12 +140,12 @@ public interface SchemaBuilder<
      *
      * such as,
      *
-     * 
                      
+     * <pre>{@code
      * <element name="foo">
      *   <empty />              <!-- this becomes 'P' -->
      *   <foreign:annotation /> <!-- this becomes 'E' -->
      * </element>
-     * 
                      
+     * }
      */
     P annotateAfter(P p, E e) throws BuildException;
 
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java
index edd40c68504..45112c3b3c4 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java
@@ -72,7 +72,7 @@ import org.xml.sax.ErrorHandler;
  * 
  *
  * 
                      
- * The checking is done by using the rngom.binary package, so if you are using
+ * The checking is done by using the {@code rngom.binary} package, so if you are using
  * that package for parsing schemas, then there's no need to use this.
  *
  * @author
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html
index 059c0046442..9fad273e3d5 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/binary/package.html
@@ -45,6 +45,6 @@
 -->
 
   
-    Minimal binarized pattern object model (one example of ast.om implementation).
+    Minimal binarized pattern object model (one example of ast.om implementation).
   
 
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html
index 048cb691b5e..a8e63b4ea37 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/nc/package.html
@@ -45,6 +45,6 @@
 -->
 
   
-    Default Name Class Object Model (one example of ast.om implementation).
+    Default Name Class Object Model (one example of ast.om implementation).
   
 
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html
index bbfe07f0563..473f5011184 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom/parse/host/package.html
@@ -43,5 +43,5 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 -->
-Implementation of the asm.builder package that uses two
+Implementation of the asm.builder package that uses two
 other builds simultaneously.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java
index 24412aa50d0..8a5bb1a66f9 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java
@@ -52,7 +52,7 @@ public interface XSAnnotation
      * @param o
      *      can be null.
      * @return
-     *      old value that was replaced by the o.
+     *      old value that was replaced by the {@code o}.
      */
     Object setAnnotation(Object o);
 
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java
index e90cb2d823e..37cb6f8b9f0 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSComponent.java
@@ -54,7 +54,7 @@ public interface XSComponent
      *      false to make this method behavel like {@link #getAnnotation()}.
      *
      * @return
-     *      null if createIfNotExist==false and annotation didn't exist.
+     *      null if {@code createIfNotExist==false} and annotation didn't exist.
      *      Otherwise non-null.
      */
     XSAnnotation getAnnotation(boolean createIfNotExist);
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java
index bbbb1eb1b18..41286413e6e 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java
@@ -132,7 +132,7 @@ public interface XSElementDecl extends XSDeclaration, XSTerm
      * by the given declaration.
      *
      * 
                      
-     * Just a short cut of getSubstitutables().contain(e);
+     * Just a short cut of {@code getSubstitutables().contain(e);}
      */
     boolean canBeSubstitutedBy(XSElementDecl e);
 
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java
index c908f1cb9e6..cfe8dbe82a8 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/XSType.java
@@ -35,7 +35,7 @@ public interface XSType extends XSDeclaration {
     /**
      * Returns the base type of this type.
      *
-     * Note that if this type represents xs:anyType, this method returns itself.
+     * Note that if this type represents {@code xs:anyType}, this method returns itself.
      * This is awkward as an API, but it follows the schema specification.
      *
      * @return  always non-null.
@@ -48,9 +48,9 @@ public interface XSType extends XSDeclaration {
 
     int getDerivationMethod();
 
-    /** Returns true if this instanceof XSSimpleType. */
+    /** Returns true if {@code this instanceof XSSimpleType}. */
     boolean isSimpleType();
-    /** Returns true if this instanceof XSComplexType. */
+    /** Returns true if {@code this instanceof XSComplexType}. */
     boolean isComplexType();
 
     /**
@@ -90,7 +90,7 @@ public interface XSType extends XSDeclaration {
      * Returns true if this type is derived from the specified type.
      *
      * 
                      
-     * Note that t.isDerivedFrom(t) returns true.
+     * Note that {@code t.isDerivedFrom(t)} returns true.
      */
     boolean isDerivedFrom( XSType t );
 }
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java
index f36cf9d99b3..77e7addfb8e 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java
@@ -71,14 +71,14 @@ public abstract class NGCCInterleaveFilter implements NGCCEventSource, NGCCEvent
 //
     /**
      * Receiver that is being locked and therefore receives all the events.
-     * 
                      
+     * <pre>{@code
      * <interleave>
      *   <element name="foo"/>
      *   <element name="bar">
      *     <element name="foo"/>
      *   </element>
      * </interlaeve>
-     * 
                      
+     * }
      * When processing inside the bar element, this receiver is
      * "locked" so that it can correctly receive its child foo element.
      */
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java
index 6bb35c54e90..69ed6c1cced 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java
@@ -163,28 +163,28 @@ public class NGCCRuntime implements ContentHandler, NGCCEventSource {
      * Whitespace handling is a tricky business. Consider the following
      * schema fragment:
      *
-     * 
+     * <pre>{@code
      * <element name="foo">
      *   <choice>
      *     <element name="bar"><empty/></element>
      *     <text/>
      *   </choice>
      * </element>
-     * 
+     * }
      *
      * Assume we hit the following instance:
-     * 
+     * <pre>{@code
      * <foo> <bar/></foo>
-     * 
+     * }
      *
      * Then this first space needs to be ignored (for otherwise, we will
      * end up treating this space as the match to <text/> and won't
      * be able to process <bar>.)
      *
      * Now assume the following instance:
-     * 
+     * <pre>{@code
      * <foo/>
-     * 
+     * }
      *
      * This time, we need to treat this empty string as a text, for
      * otherwise we won't be able to accept this instance.
@@ -481,16 +481,16 @@ public class NGCCRuntime implements ContentHandler, NGCCEventSource {
      * the top of the effective bindings. Because of the
      * timing difference between the startPrefixMapping method
      * and the execution of the corresponding actions,
-     * this value can be different from namespaces.size().
+     * this value can be different from {@code namespaces.size()}.
      * 
                      
      * For example, consider the following schema:
-     * 
                      
+     * <pre>{@code
      *  <oneOrMore>
      *   <element name="foo"><empty/></element>
      *  </oneOrMore>
      *  code fragment X
      *  <element name="bob"/>
-     * 
                      
+     * }
      * Code fragment X is executed after we see a startElement event,
      * but at this time the namespaces variable already include new
      * namespace bindings declared on "bob".
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java
index af993d7df96..b9ab3fa6421 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java
@@ -33,7 +33,7 @@ import java.util.Set;
  * Represents a parsed XML schema document.
  *
  * 
                      
- * Unlike schema components defined in XS**** interfaces,
+ * Unlike schema components defined in {@code XS****} interfaces,
  * which are inherently de-coupled from where it was loaded from,
  * {@link SchemaDocument} represents a single XML infoset that
  * is a schema document.
@@ -58,7 +58,7 @@ public interface SchemaDocument {
      * The namespace that this schema defines.
      *
      * 
                      
-     * More precisely, this method simply returns the targetNamespace attribute
+     * More precisely, this method simply returns the {@code targetNamespace} attribute
      * of the schema document. When schemas are referenced in certain ways
      * (AKA chameleon schema), schema components in this schema document
      * may end up defining components in other namespaces.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
index c160692feb5..ae51a767e2a 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
@@ -43,7 +43,7 @@ import org.relaxng.datatype.*;
  *
  * 
                      
  * Typical usage would be:
- * 
                      
+ * <PRE>{@code
  * class MyDatatypeLibrary implements DatatypeLibrary {
  *     ....
  *     DatatypeBuilder createDatatypeBuilder( String typeName ) {
@@ -51,7 +51,7 @@ import org.relaxng.datatype.*;
  *     }
  *     ....
  * }
- * 
                      
+ * }
  *
  * @author Kohsuke KAWAGUCHI
  */
diff --git a/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
index 51628bafe54..e0142d99dfa 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
@@ -45,7 +45,7 @@ import org.relaxng.datatype.*;
  *
  * 
                      
  * Typical usage would be:
- * 
                      
+ * <PRE>{@code
  * class MyDatatype implements Datatype {
  *     ....
  *     public DatatypeStreamingValidator createStreamingValidator( ValidationContext context ) {
@@ -53,7 +53,7 @@ import org.relaxng.datatype.*;
  *     }
  *     ....
  * }
- * 
                      
+ * }
  *
  * @author Kohsuke KAWAGUCHI
  */
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java
index 0d9d0982e9e..0974898da82 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java
@@ -30,7 +30,7 @@ package com.sun.tools.internal.ws.api;
  * The extension implementations are found using service
  * discovery mechanism i.e. JAX-WS tooltime locates
  * {@link WsgenExtension}s through the
- * META-INF/services/com.sun.tools.internal.ws.api.WsgenExtension
+ * {@code META-INF/services/com.sun.tools.internal.ws.api.WsgenExtension}
  * files.
  *
  * {@link WsgenProtocol} annotation can be specified on the

                  Java Type
                  DataHandler.getContentType()instanceof DataHandler.getContent(){@code DataHandler.getContentType()}{@code instanceof DataHandler.getContent()}