diff --git a/api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java b/api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java index 8ca5b51..49cc99c 100644 --- a/api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java +++ b/api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -10,12 +10,16 @@ package jakarta.xml.bind.annotation; -import jakarta.activation.DataHandler; -import static java.lang.annotation.ElementType.*; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.activation.DataHandler; + /** * Marks a field/property that its XML form is a uri reference to mime content. * The mime content is optimally stored out-of-line as an attachment. @@ -48,7 +52,7 @@ * } * *

- * The above binding supports WS-I AP 1.0 WS-I Attachments Profile Version 1.0. + * The above binding supports WS-I AP 1.0 WS-I Attachments Profile Version 1.0. * * @author Kohsuke Kawaguchi * @since 1.6, JAXB 2.0 diff --git a/api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java b/api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java index fae7f70..c250ae9 100644 --- a/api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java +++ b/api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -40,7 +40,7 @@ * @see Marshaller#setAttachmentMarshaller(AttachmentMarshaller) * * @see XML-binary Optimized Packaging - * @see WS-I Attachments Profile Version 1.0. + * @see WS-I Attachments Profile Version 1.0. */ public abstract class AttachmentMarshaller { @@ -184,7 +184,7 @@ protected AttachmentMarshaller() {} * represents the data to be attached. Must be non-null. * @return * must be a valid URI used as cid. Must satisfy Conformance Requirement R2928 from - * WS-I Attachments Profile Version 1.0. + * WS-I Attachments Profile Version 1.0. */ public abstract String addSwaRefAttachment(DataHandler data); } diff --git a/api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java b/api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java index f31622e..b29d944 100644 --- a/api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java +++ b/api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -34,7 +34,7 @@ *

  • * For WS-I AP 1.0, the cid is identified as an element or attribute of * type {@code ref:swaRef} specified in - * + * * Section 4.4 Referencing Attachments from the SOAP Envelope *
    • * @@ -48,7 +48,7 @@ * @see jakarta.xml.bind.Unmarshaller#setAttachmentUnmarshaller(AttachmentUnmarshaller) * * @see XML-binary Optimized Packaging - * @see WS-I Attachments Profile Version 1.0. + * @see WS-I Attachments Profile Version 1.0. * @see Describing Media Content of Binary Data in XML */ public abstract class AttachmentUnmarshaller { diff --git a/api/src/main/java/jakarta/xml/bind/attachment/package-info.java b/api/src/main/java/jakarta/xml/bind/attachment/package-info.java index e570c53..ceafa64 100644 --- a/api/src/main/java/jakarta/xml/bind/attachment/package-info.java +++ b/api/src/main/java/jakarta/xml/bind/attachment/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2023 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -29,13 +29,13 @@ * * * @see [1]SOAP Message Transmission Optimization Mechanism * @see [2]XML-binary Optimized Packaging - * @see [3]WS-I Attachments Profile Version 1.0. + * @see [3]WS-I Attachments Profile Version 1.0. * @see [4]Describing Media Content of Binary Data in XML * @since JAXB 2.0 */ diff --git a/spec/src/main/asciidoc/appA-references.adoc b/spec/src/main/asciidoc/appA-references.adoc index 4f258a8..4f35a0f 100644 --- a/spec/src/main/asciidoc/appA-references.adoc +++ b/spec/src/main/asciidoc/appA-references.adoc @@ -87,8 +87,8 @@ _http://www.w3.org/TR/2005/NOTE-xml-media-types-20050504_ [WSIAP] Chris Ferris, Anish Karmarkar, and Canyang Kevin Liu. Attachments Profile Version 1.0. Final 1 Material, -WS-I, August 2004. + -_http://www.ws-i.org/Profiles/AttachmentsProfile-1.0-2004-08-24.html_. +WS-I, April 2006. + +_http://www.ws-i.org/Profiles/AttachmentsProfile-1.0.html_. [WSIBP] WS-I Basic Profile 1.0, + _http://www.ws-i.org/Profile/Basic/2003-08/BasicProfile-1.0a.html_