Merge

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java

@@ -243,7 +243,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
  * </pre>
  *
  * @author Kohsuke Kawaguchi
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME)
 @Target({FIELD,METHOD})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java

@@ -66,7 +66,7 @@ import java.lang.annotation.Target;
  * The above binding supports WS-I AP 1.0 <a href="http://www.ws-i.org/Profiles/AttachmentsProfile-1.0-2004-08-24.html#Referencing_Attachments_from_the_SOAP_Envelope">WS-I Attachments Profile Version 1.0.</a>
  *
  * @author Kohsuke Kawaguchi
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME)
 @Target({FIELD,METHOD,PARAMETER})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java

@@ -122,7 +122,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * </pre>
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @see XmlType
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 
 @Retention(RUNTIME) @Target({FIELD, METHOD})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java

@@ -134,7 +134,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *
  * <p>
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 
 @Retention(RUNTIME) @Target({FIELD, METHOD, PARAMETER})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java

@@ -130,7 +130,7 @@ import static java.lang.annotation.ElementType.METHOD;
  * name "foo".
  *
  * @see XmlRegistry
- * @since JAXB 2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME)
 @Target({METHOD})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java

@@ -216,7 +216,7 @@ import static java.lang.annotation.ElementType.METHOD;
  *
  * @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems,Inc. </li><li>Sekhar Vajjhala, Sun Microsystems, Inc.</li></ul>
  * @see XmlElementRefs
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME)
 @Target({FIELD,METHOD})
@@ -284,7 +284,7 @@ public @interface XmlElementRef {
      * For compatibility with JAXB 2.1, this property defaults to <tt>true</tt>,
      * despite the fact that {@link XmlElement#required()} defaults to false.
      *
-     * @since 2.2
+     * @since 1.7, JAXB 2.2
      */
     boolean required() default true;
 }

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java

@@ -50,7 +50,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
  *
  * @see XmlElementWrapper
  * @see XmlElementRef
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME)
 @Target({FIELD,METHOD})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java

@@ -87,7 +87,7 @@ import java.lang.annotation.Target;
  * @see XmlElements
  * @see XmlElementRef
  * @see XmlElementRefs
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  *
  */
 
@@ -139,7 +139,7 @@ public @interface XmlElementWrapper {
      * simply a mechanism to let users express their application constraints
      * better.
      *
-     * @since JAXB 2.1
+     * @since 1.6, JAXB 2.1
      */
     boolean required() default false;
 }

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java

@@ -166,7 +166,7 @@ import java.lang.annotation.Target;
  * @see XmlElementRef
  * @see XmlElementRefs
  * @see XmlJavaTypeAdapter
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME) @Target({FIELD,METHOD})
 public @interface XmlElements {

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java

@@ -62,7 +62,7 @@ import java.lang.annotation.Target;
  *
  * <p><b>Examples:</b> See examples in {@link XmlEnumValue}
  *
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 
 @Retention(RUNTIME) @Target({TYPE})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java

@@ -114,7 +114,7 @@ import static java.lang.annotation.ElementType.FIELD;
  *     </xs:simpleType>
  * </pre>
  *
- * @since JAXB 2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME)
 @Target({FIELD})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java

@@ -87,7 +87,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @see XmlIDREF
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 
 @Retention(RUNTIME) @Target({FIELD, METHOD})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java

@@ -243,7 +243,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * </pre>
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @see XmlID
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 
 @Retention(RUNTIME) @Target({FIELD, METHOD})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlInlineBinaryData.java

@@ -51,7 +51,7 @@ import javax.activation.DataHandler;
  * ever called for the property. The binary data will always be inlined.
  *
  * @author Joseph Fialli
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME)
 @Target({FIELD,METHOD,TYPE})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java

@@ -104,7 +104,7 @@ import static java.lang.annotation.ElementType.PARAMETER;
  *  </ul>
  *
  * @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Sekhar Vajjhala, Sun Microsystems, Inc.</li></ul>
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME) @Target({FIELD,METHOD,PARAMETER})
 public @interface XmlList {

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMimeType.java

@@ -47,7 +47,7 @@ import javax.xml.transform.Source;
  * the value of the attribute takes precedence and that will control the marshalling.
  *
  * @author Kohsuke Kawaguchi
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME)
 @Target({FIELD,METHOD,PARAMETER})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java

@@ -124,7 +124,7 @@ import javax.xml.bind.JAXBElement;
  * <p>See "Package Specification" in javax.xml.bind.package javadoc for
  * additional common information.</p>
  * @author Kohsuke Kawaguchi
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME)
 @Target({FIELD,METHOD})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java

@@ -42,7 +42,7 @@ import java.lang.annotation.Target;
  *
  * <p><b>Example:</b>See <tt>XmlSchema</tt> annotation type for an example.
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 
 @Retention(RUNTIME) @Target({})

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java

@@ -61,6 +61,6 @@ package javax.xml.bind.annotation;
  * </table>
  *
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 public enum XmlNsForm {UNQUALIFIED, QUALIFIED, UNSET}

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java

@@ -34,7 +34,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
  * Marks a class that has {@link XmlElementDecl}s.
  *
  * @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Sekhar Vajjhala, Sun Microsystems, Inc.</li></ul>
- * @since JAXB 2.0
+ * @since 1.6, JAXB 2.0
  * @see XmlElementDecl
  */
 @Retention(RUNTIME)