Merge

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

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

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

@@ -114,7 +114,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * </pre>
 
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 
 @Retention(RUNTIME) @Target(PACKAGE)
@@ -191,7 +191,7 @@ public @interface XmlSchema {
      * such attribute), for example so that the user can specify a local
      * copy of the resource through the command line interface.
      *
-     * @since JAXB2.1
+     * @since 1.6, JAXB 2.1
      */
     String location() default NO_LOCATION;
 

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

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

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

@@ -50,7 +50,7 @@ import java.lang.annotation.Target;
  *
  * @author <ul><li>Sekhar Vajjhala, Sun Microsystems, Inc.</li></ul>
  * @see XmlSchemaType
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME) @Target({PACKAGE})
 public @interface XmlSchemaTypes {

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

@@ -70,7 +70,7 @@ import java.lang.annotation.Target;
  * correctly bind <tt>Dog</tt> and <tt>Cat</tt>.
  *
  * @author Kohsuke Kawaguchi
- * @since JAXB2.1
+ * @since 1.6, JAXB 2.1
  */
 @Target({ElementType.TYPE})
 @Retention(RUNTIME)

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

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

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

@@ -379,7 +379,7 @@ import java.lang.annotation.Target;
  * @see XmlAttribute
  * @see XmlValue
  * @see XmlSchema
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 
 @Retention(RUNTIME) @Target({TYPE})

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

@@ -124,7 +124,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *
  * @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/adapters/CollapsedStringAdapter.java

@@ -35,7 +35,7 @@ package javax.xml.bind.annotation.adapters;
  * sequnce of tab, CR, LF, and SP by a single whitespace character ' '.
  *
  * @author Kohsuke Kawaguchi
- * @since JAXB 2.0
+ * @since 1.6, JAXB 2.0
  */
 public class CollapsedStringAdapter extends XmlAdapter<String,String> {
     /**

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java

@@ -34,7 +34,7 @@ import javax.xml.bind.DatatypeConverter;
  * This {@link XmlAdapter} binds <tt>byte[]</tt> to the hexBinary representation in XML.
  *
  * @author Kohsuke Kawaguchi
- * @since JAXB 2.0
+ * @since 1.6, JAXB 2.0
  */
 public final class HexBinaryAdapter extends XmlAdapter<String,byte[]> {
     public byte[] unmarshal(String s) {

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java

@@ -35,7 +35,7 @@ package javax.xml.bind.annotation.adapters;
  * as specified in <a href="http://www.w3.org/TR/xmlschema-2/#rf-whiteSpace">the whitespace facet 'replace'</a>
  *
  * @author Kohsuke Kawaguchi, Martin Grebac
- * @since JAXB 2.0
+ * @since 1.6, JAXB 2.0
  */
 public final class NormalizedStringAdapter extends XmlAdapter<String,String> {
     /**

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlAdapter.java

@@ -160,7 +160,7 @@ package javax.xml.bind.annotation.adapters;
  *
  * @author <ul><li>Sekhar Vajjhala, Sun Microsystems Inc.</li> <li> Kohsuke Kawaguchi, Sun Microsystems Inc.</li></ul>
  * @see XmlJavaTypeAdapter
- * @since JAXB 2.0
+ * @since 1.6, JAXB 2.0
  */
 public abstract class XmlAdapter<ValueType,BoundType> {
 

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java

@@ -86,7 +86,7 @@ import static java.lang.annotation.ElementType.PACKAGE;
  * <p><b> Example: </b> See example in {@link XmlAdapter}
  *
  * @author <ul><li>Sekhar Vajjhala, Sun Microsystems Inc.</li> <li> Kohsuke Kawaguchi, Sun Microsystems Inc.</li></ul>
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  * @see XmlAdapter
  */
 

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java

@@ -51,7 +51,7 @@ import java.lang.annotation.Target;
  *
  * @author <ul><li>Sekhar Vajjhala, Sun Microsystems, Inc.</li></ul>
  * @see XmlJavaTypeAdapter
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME) @Target({PACKAGE})
 public @interface XmlJavaTypeAdapters {

jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/package.html

@@ -279,7 +279,7 @@
         </table>
 
         <!-- Put @see and @since tags down here. -->
-        @since JAXB 2.0
+        @since 1.6, JAXB 2.0
     </body>
 </html>
 

jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java

@@ -50,7 +50,7 @@ import javax.xml.bind.Marshaller;
  * @author Marc Hadley
  * @author Kohsuke Kawaguchi
  * @author Joseph Fialli
- * @since JAXB 2.0
+ * @since 1.6, JAXB 2.0
  *
  * @see Marshaller#setAttachmentMarshaller(AttachmentMarshaller)
  *

jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java

@@ -56,7 +56,7 @@ import javax.activation.DataHandler;
  * @author Kohsuke Kawaguchi
  * @author Joseph Fialli
  *
- * @since JAXB 2.0
+ * @since 1.6, JAXB 2.0
  *
  * @see javax.xml.bind.Unmarshaller#setAttachmentUnmarshaller(AttachmentUnmarshaller)
  *

jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/package.html

@@ -61,7 +61,7 @@
         </ul>
 
         <!-- Put @see and @since tags down here. -->
-        @since JAXB 2.0
+        @since 1.6, JAXB 2.0
     </body>
 </html>
 

jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java

@@ -62,7 +62,7 @@ import java.io.IOException;
  *
  * @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li></ul>
  * @see javax.xml.bind.Marshaller
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public abstract class AbstractMarshallerImpl implements Marshaller
 {

jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java

@@ -68,7 +68,7 @@ import java.net.URL;
  *         <li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li>
  *         </ul>
  * @see javax.xml.bind.Unmarshaller
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public abstract class AbstractUnmarshallerImpl implements Unmarshaller
 {