diff --git a/jaxws/src/share/jaf_classes/javax/activation/CommandMap.java b/jaxws/src/share/jaf_classes/javax/activation/CommandMap.java
index d07ae3ec38bbfb61a7a620108723fa3060d25cfd..acc194b5248a6abdc615644f768edbe736498a6a 100644
--- a/jaxws/src/share/jaf_classes/javax/activation/CommandMap.java
+++ b/jaxws/src/share/jaf_classes/javax/activation/CommandMap.java
@@ -127,7 +127,7 @@ public abstract class CommandMap {
      * @param mimeType  the MIME type
      * @param ds        a DataSource for the data
      * @return the CommandInfo classes that represent the command Beans.
-     * @since   JAF 1.1
+     * @since   1.6, JAF 1.1
      */
     public CommandInfo[] getPreferredCommands(String mimeType, DataSource ds) {
         return getPreferredCommands(mimeType);
@@ -155,7 +155,7 @@ public abstract class CommandMap {
      * @param mimeType  the MIME type
      * @param ds        a DataSource for the data
      * @return the CommandInfo objects representing all the commands.
-     * @since   JAF 1.1
+     * @since   1.6, JAF 1.1
      */
     public CommandInfo[] getAllCommands(String mimeType, DataSource ds) {
         return getAllCommands(mimeType);
@@ -183,7 +183,7 @@ public abstract class CommandMap {
      * @param cmdName   the command name
      * @param ds        a DataSource for the data
      * @return the CommandInfo corresponding to the command.
-     * @since   JAF 1.1
+     * @since   1.6, JAF 1.1
      */
     public CommandInfo getCommand(String mimeType, String cmdName,
                                 DataSource ds) {
@@ -215,7 +215,7 @@ public abstract class CommandMap {
      * @param mimeType  the MIME type
      * @param ds        a DataSource for the data
      * @return          the DataContentHandler for the MIME type
-     * @since   JAF 1.1
+     * @since   1.6, JAF 1.1
      */
     public DataContentHandler createDataContentHandler(String mimeType,
                                 DataSource ds) {
@@ -228,7 +228,7 @@ public abstract class CommandMap {
      * null is returned.
      *
      * @return          array of MIME types as strings, or null if not supported
-     * @since   JAF 1.1
+     * @since   1.6, JAF 1.1
      */
     public String[] getMimeTypes() {
         return null;
diff --git a/jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java b/jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java
index 91df5fe9afb839e553082f05d0f4e66d8b2b8c31..7d13a9b506f50a18e1debffea17f8deb3cad40a3 100644
--- a/jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java
+++ b/jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java
@@ -603,7 +603,7 @@ public class MailcapCommandMap extends CommandMap {
      * Get all the MIME types known to this command map.
      *
      * @return          array of MIME types as strings
-     * @since   JAF 1.1
+     * @since   1.6, JAF 1.1
      */
     public synchronized String[] getMimeTypes() {
         List mtList = new ArrayList();
@@ -639,7 +639,7 @@ public class MailcapCommandMap extends CommandMap {
      * MIME type are returned.
      *
      * @return          array of native command entries
-     * @since   JAF 1.1
+     * @since   1.6, JAF 1.1
      */
     public synchronized String[] getNativeCommands(String mimeType) {
         List cmdList = new ArrayList();
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java
index 7f58b05f24f17616d4100623d479993c312ead68..8f5c7e6658518b5f562c3ef6a51c0dcf460cc050 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java
@@ -58,7 +58,7 @@ import javax.xml.stream.XMLStreamWriter;
  * This class is responsible for whitespace normalization.
  *
  * @author <ul><li>Ryan Shoemaker, Martin Grebac</li></ul>
- * @since JAXB1.0
+ * @since JAXB 1.0
  * @deprecated in JAXB 2.2.4 - use javax.xml.bind.DatatypeConverterImpl instead
  * or let us know why you can't
  */
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages.java
index 13e42bb6328b6565481534d44f19a7a7b2f34470..50554b51c15badb88e040f0c483c43d2866f0d27 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages.java
@@ -31,7 +31,7 @@ import java.util.ResourceBundle;
 /**
  * Formats error messages.
  *
- * @since JAXB2.1.10
+ * @since JAXB 2.1.10
  */
 
 enum Messages {
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages.java
index 97c98af48351a3348615e10f4eea98770ba41e16..b736fd9cb454ef8d94e71fff33e993a8cb484d62 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages.java
@@ -31,7 +31,7 @@ import java.util.ResourceBundle;
 /**
  * Formats error messages.
  *
- * @since JAXB1.0
+ * @since JAXB 1.0
  */
 public class Messages
 {
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java
index 6e1dd7b2359e3183c9a2764aa06918a748a64d3c..3fbd954efa6ebe89351b347c753087738ded0d1f 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java
@@ -249,7 +249,7 @@ import org.xml.sax.helpers.XMLFilterImpl;
  *
  * @author David Megginson, david@megginson.com
  * @version 0.2
- * @since JAXB1.0
+ * @since JAXB 1.0
  * @see org.xml.sax.XMLFilter
  * @see org.xml.sax.ContentHandler
  */
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
index c43a3d9a402e72ee788a00f3db947612d4d48561..8be5e51a98007a02ca374004fa629951bd072ae0 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
@@ -55,7 +55,7 @@ import org.xml.sax.helpers.NamespaceSupport;
  * classes like this.
  *
  * @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li></ul>
- * @since JAXB1.0
+ * @since JAXB 1.0
  */
 public class DOMScanner implements LocatorEx,InfosetScanner/*<Node> --- but can't do this to protect 1.0 clients, or can I? */
 {
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages.java
index 730fb17ddaad96b01f902b677eebfbf7fbe6f244..b199f76a8442d1feb197013b986a05c27cbc05fe 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages.java
@@ -31,7 +31,7 @@ import java.util.ResourceBundle;
 /**
  * Formats error messages.
  *
- * @since JAXB1.0
+ * @since JAXB 1.0
  */
 public class Messages
 {
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/AttributesImpl.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/AttributesImpl.java
index c0f345aaf2db4e139ef9d5f9c5fe04f8230f7d59..26a328556dc7b21416b9f7062342b69e70cd42b5 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/AttributesImpl.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/AttributesImpl.java
@@ -62,7 +62,7 @@ import org.xml.sax.Attributes;
  * AttributeList} interface, it also includes a much more efficient
  * implementation using a single array rather than a set of Vectors.</p>
  *
- * @since JAXB1.0
+ * @since JAXB 1.0
  * @since SAX 2.0
  * @author David Megginson
  * @version 2.0.1 (sax2r2)
diff --git a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java
index 5ea7a6842f9011e9b16203cee5da5840dc3385a3..fe1d274df36918b6c9ba776d88f473109b175ee5 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java
@@ -262,7 +262,7 @@ import java.util.Map;
  *
  * @author David Megginson, david@megginson.com
  * @version 0.2
- * @since JAXB1.0
+ * @since JAXB 1.0
  * @see org.xml.sax.XMLFilter
  * @see org.xml.sax.ContentHandler
  */
diff --git a/jaxws/src/share/jaxws_classes/javax/annotation/Generated.java b/jaxws/src/share/jaxws_classes/javax/annotation/Generated.java
index f9d34e4a398eb8b079b58355d753b899b833d6c4..b59595f98f8d10b82f010866e35704c399ce1a17 100644
--- a/jaxws/src/share/jaxws_classes/javax/annotation/Generated.java
+++ b/jaxws/src/share/jaxws_classes/javax/annotation/Generated.java
@@ -43,7 +43,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * <p>The comment element is a place holder for any comments that the code
  * generator may want to include in the generated code.</p>
  *
- * @since Common Annotations 1.0
+ * @since 1.6, Common Annotations 1.0
  */
 
 @Documented
diff --git a/jaxws/src/share/jaxws_classes/javax/annotation/PostConstruct.java b/jaxws/src/share/jaxws_classes/javax/annotation/PostConstruct.java
index 4f2976ca617e3826d32ad9f8486d41ffb70c16fa..fbe226ca42efa27519364303febc4401e2dfc998 100644
--- a/jaxws/src/share/jaxws_classes/javax/annotation/PostConstruct.java
+++ b/jaxws/src/share/jaxws_classes/javax/annotation/PostConstruct.java
@@ -70,9 +70,10 @@ import static java.lang.annotation.RetentionPolicy.*;
  * <li>If the method throws an unchecked exception the class MUST NOT be put into
  * service except in the case of EJBs where the EJB can handle exceptions and
  * even recover from them.</li></ul>
- * @since Common Annotations 1.0
+ *
  * @see javax.annotation.PreDestroy
  * @see javax.annotation.Resource
+ * @since 1.6, Common Annotations 1.0
  */
 @Documented
 @Retention (RUNTIME)
diff --git a/jaxws/src/share/jaxws_classes/javax/annotation/PreDestroy.java b/jaxws/src/share/jaxws_classes/javax/annotation/PreDestroy.java
index d24cd3f70ad5250243ae288b47cd06d24f489040..eff974a5e4a68f8b7d6394d9cde3d25cd3bd0a5d 100644
--- a/jaxws/src/share/jaxws_classes/javax/annotation/PreDestroy.java
+++ b/jaxws/src/share/jaxws_classes/javax/annotation/PreDestroy.java
@@ -72,7 +72,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *
  * @see javax.annotation.PostConstruct
  * @see javax.annotation.Resource
- * @since Common Annotations 1.0
+ * @since 1.6, Common Annotations 1.0
  */
 
 @Documented
diff --git a/jaxws/src/share/jaxws_classes/javax/annotation/Resource.java b/jaxws/src/share/jaxws_classes/javax/annotation/Resource.java
index 7c6541139faab378563aa3c72505edb5c9935481..0f29fa5e6b8efe787bb91fbd8680d177cf050a81 100644
--- a/jaxws/src/share/jaxws_classes/javax/annotation/Resource.java
+++ b/jaxws/src/share/jaxws_classes/javax/annotation/Resource.java
@@ -48,7 +48,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * appear on private fields and methods of superclasses; the container
  * is required to perform injection in these cases as well.
  *
- * @since Common Annotations 1.0
+ * @since 1.6, Common Annotations 1.0
  */
 @Target({TYPE, FIELD, METHOD})
 @Retention(RUNTIME)
@@ -66,7 +66,7 @@ public @interface Resource {
      * The name of the resource that the reference points to. It can
      * link to any compatible resource using the global JNDI names.
      *
-     * @since Common Annotations 1.1
+     * @since 1.7, Common Annotations 1.1
      */
 
     String lookup() default "";
diff --git a/jaxws/src/share/jaxws_classes/javax/annotation/Resources.java b/jaxws/src/share/jaxws_classes/javax/annotation/Resources.java
index 6bbe04e01c764a6a26e91f3d00db62369c2c353d..7b6e1dec589c78f03bbe09f2261673c2b3f763c7 100644
--- a/jaxws/src/share/jaxws_classes/javax/annotation/Resources.java
+++ b/jaxws/src/share/jaxws_classes/javax/annotation/Resources.java
@@ -32,7 +32,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * This class is used to allow multiple resources declarations.
  *
  * @see javax.annotation.Resource
- * @since Common Annotations 1.0
+ * @since 1.6, Common Annotations 1.0
  */
 
 @Documented
diff --git a/jaxws/src/share/jaxws_classes/javax/jws/HandlerChain.java b/jaxws/src/share/jaxws_classes/javax/jws/HandlerChain.java
index 497f8b5aa69742b2b7fbcca0c3ca1edb66bab523..cb52ff235d3fa3dc9a0f8354bb4735cc21b7539c 100644
--- a/jaxws/src/share/jaxws_classes/javax/jws/HandlerChain.java
+++ b/jaxws/src/share/jaxws_classes/javax/jws/HandlerChain.java
@@ -28,6 +28,9 @@ package javax.jws;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 
+/**
+ * @since 1.6
+ */
 @Retention(value=RetentionPolicy.RUNTIME)
 @Target({TYPE, METHOD, FIELD})
 public @interface HandlerChain {
diff --git a/jaxws/src/share/jaxws_classes/javax/jws/Oneway.java b/jaxws/src/share/jaxws_classes/javax/jws/Oneway.java
index f5a4823211d1ee66447a8dfd42a12673a6df607e..613e0940c8ba610574ef571e8df96b262c73ac0a 100644
--- a/jaxws/src/share/jaxws_classes/javax/jws/Oneway.java
+++ b/jaxws/src/share/jaxws_classes/javax/jws/Oneway.java
@@ -27,6 +27,9 @@ package javax.jws;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 
+/**
+ * @since 1.6
+ */
 @Retention(value=RetentionPolicy.RUNTIME)
 @Target({METHOD})
 public @interface Oneway {
diff --git a/jaxws/src/share/jaxws_classes/javax/jws/WebMethod.java b/jaxws/src/share/jaxws_classes/javax/jws/WebMethod.java
index ae3f31561402611d8287476bff7ff1bc0b8ecc4b..f2eeaf08b03d7f2180ccb8ff2a1f273364e5d12b 100644
--- a/jaxws/src/share/jaxws_classes/javax/jws/WebMethod.java
+++ b/jaxws/src/share/jaxws_classes/javax/jws/WebMethod.java
@@ -27,6 +27,9 @@ package javax.jws;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 
+/**
+ * @since 1.6
+ */
 @Retention(value=RetentionPolicy.RUNTIME)
 @Target({METHOD})
 public @interface WebMethod {
diff --git a/jaxws/src/share/jaxws_classes/javax/jws/WebParam.java b/jaxws/src/share/jaxws_classes/javax/jws/WebParam.java
index ac7752fdbf03ecf89a3a850fd57eae38a44a6330..df9f3d9bd581cdeefbe785b8bf5e288c89918888 100644
--- a/jaxws/src/share/jaxws_classes/javax/jws/WebParam.java
+++ b/jaxws/src/share/jaxws_classes/javax/jws/WebParam.java
@@ -27,6 +27,9 @@ package javax.jws;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 
+/**
+ * @since 1.6
+ */
 @Retention(value=RetentionPolicy.RUNTIME)
 @Target({PARAMETER})
 public @interface WebParam {
diff --git a/jaxws/src/share/jaxws_classes/javax/jws/WebResult.java b/jaxws/src/share/jaxws_classes/javax/jws/WebResult.java
index 800fa6590291df9ba0a1ea5712aed39f9278304c..c878433a077a105677ed29d17555388f640a3b16 100644
--- a/jaxws/src/share/jaxws_classes/javax/jws/WebResult.java
+++ b/jaxws/src/share/jaxws_classes/javax/jws/WebResult.java
@@ -27,6 +27,9 @@ package javax.jws;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 
+/**
+ * @since 1.6
+ */
 @Retention(value=RetentionPolicy.RUNTIME)
 @Target({METHOD})
 public @interface WebResult {
diff --git a/jaxws/src/share/jaxws_classes/javax/jws/WebService.java b/jaxws/src/share/jaxws_classes/javax/jws/WebService.java
index 8d29d21c947347caea2211e34f121b8caaa04d0f..c133f58354764a64e57d46b7d317dcd9a5f5496f 100644
--- a/jaxws/src/share/jaxws_classes/javax/jws/WebService.java
+++ b/jaxws/src/share/jaxws_classes/javax/jws/WebService.java
@@ -27,6 +27,9 @@ package javax.jws;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 
+/**
+ * @since 1.6
+ */
 @Retention(value=RetentionPolicy.RUNTIME)
 @Target({TYPE})
 public @interface WebService {
diff --git a/jaxws/src/share/jaxws_classes/javax/jws/soap/InitParam.java b/jaxws/src/share/jaxws_classes/javax/jws/soap/InitParam.java
index 83acb8b425498703030e95e51ad006d30e3135a0..43088e25e200751b0472ec9387bb9f26a8f36325 100644
--- a/jaxws/src/share/jaxws_classes/javax/jws/soap/InitParam.java
+++ b/jaxws/src/share/jaxws_classes/javax/jws/soap/InitParam.java
@@ -25,7 +25,8 @@
 
 package javax.jws.soap;
 
-/*
+/**
+ * @since 1.6
  * @Deprecated
  */
 @Deprecated public @interface InitParam {
diff --git a/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPBinding.java b/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPBinding.java
index 5966f11032afe10800da58a6cf82c9a43376f5aa..5fb23ba09bbf1d67e442cbd36f68bf21d21dfd2e 100644
--- a/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPBinding.java
+++ b/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPBinding.java
@@ -27,6 +27,9 @@ package javax.jws.soap;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 
+/**
+ * @since 1.6
+ */
 @Retention(value=RetentionPolicy.RUNTIME)
 @Target({TYPE,METHOD})
 public @interface SOAPBinding {
diff --git a/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandler.java b/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandler.java
index b586c875e89b1f53b8877cd17283fd94d46663a0..fe974e3e090162df4de38b9c00977fb8ba9534b1 100644
--- a/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandler.java
+++ b/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandler.java
@@ -25,7 +25,8 @@
 
 package javax.jws.soap;
 
-/*
+/**
+ * @since 1.6
  * @Deprecated
  */
 @Deprecated public @interface SOAPMessageHandler {
diff --git a/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandlers.java b/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandlers.java
index 068df03cce3bcb566abcf4482434d314ff4ea617..c255f756c1aca89c08b39ca7d1a300029c408058 100644
--- a/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandlers.java
+++ b/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandlers.java
@@ -27,7 +27,8 @@ package javax.jws.soap;
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 
-/*
+/**
+ * @since 1.6
  * @Deprecated
  */
 @Retention(value=RetentionPolicy.RUNTIME)
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/Binder.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/Binder.java
index a243aaaa1a95658f41563e3d5e668c71a9e5aed6..70ec8ea8af0668febef63d52e80e781eaeefb9f0 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/Binder.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/Binder.java
@@ -76,7 +76,7 @@ import javax.xml.validation.Schema;
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
  *     Joseph Fialli
  *
- * @since JAXB 2.0
+ * @since 1.6, JAXB 2.0
  */
 public abstract class Binder<XmlNode> {
     /**
@@ -153,7 +153,7 @@ public abstract class Binder<XmlNode> {
      *     binding.
      * @throws IllegalArgumentException
      *      If any of the input parameters are null
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public abstract <T> JAXBElement<T>
         unmarshal( XmlNode xmlNode, Class<T> declaredType )
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java
index 2d0461ef16c795908e8b70eca340493f9013b4ae..26c0e4e28ce62d78b5b7c62e70417366e5ee59e6 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java
@@ -34,7 +34,7 @@ package javax.xml.bind;
  * is a checked exception.
  *
  * @see JAXB
- * @since JAXB2.1
+ * @since 1.6, JAXB 2.1
  */
 public class DataBindingException extends RuntimeException {
     public DataBindingException(String message, Throwable cause) {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java
index c7cc50943b02b3902581df4db9d0510ddb472dc1..a5c8e13dbc02d576c3649cb214255eb545a2e6e3 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java
@@ -88,7 +88,7 @@ import javax.xml.namespace.NamespaceContext;
  * @see DatatypeConverterInterface
  * @see ParseConversionEvent
  * @see PrintConversionEvent
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 
 final public class DatatypeConverter {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java
index a2358500ae833b20a0b83c4502a18dd2ad4cbd31..093c2899200e90b9e8844109629dc73d92fd4375 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java
@@ -49,7 +49,7 @@ import javax.xml.datatype.DatatypeConfigurationException;
  * This class is responsible for whitespace normalization.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @since JAXB2.1
+ * @since JAXB 2.1
  */
 final class DatatypeConverterImpl implements DatatypeConverterInterface {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java
index 228673bc764ef3fdbf14b16531c3d22312899911..0f4796e0db5ca061809deedae27bb5ece21f4af9 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java
@@ -78,7 +78,7 @@ package javax.xml.bind;
  * @see DatatypeConverter
  * @see ParseConversionEvent
  * @see PrintConversionEvent
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 
 public interface DatatypeConverterInterface {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/Element.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/Element.java
index 6e576d0554844d24ea0d416df46952165f7cf376..9e2c7b99eeb642028ee55fb9de9b59e0f2c4717a 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/Element.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/Element.java
@@ -35,7 +35,7 @@ package javax.xml.bind;
  * and 5.7.1 "Bind to Java Element Interface" of the specification.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 
 public interface Element {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXB.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXB.java
index 3c16454697b2479a9a0cd1acf39069b031578a33..b6a16de0d187bfa838fe98f9b5448533c91a45a3 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXB.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXB.java
@@ -92,7 +92,7 @@ import java.net.URLConnection;
  * a non-null value.
  *
  * @author Kohsuke Kawaguchi
- * @since 2.1
+ * @since 1.6, JAXB 2.1
  */
 public final class JAXB {
     /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java
index 2d3c1255cbaa8c87072b5d17344b07baedaf30ac..77d84390c930dba552533c2424ab142c5d1900e5 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java
@@ -257,7 +257,7 @@ import java.io.InputStream;
  * @see Marshaller
  * @see Unmarshaller
  * @see S 7.4.1 "Named Packages" in Java Language Specification</a>
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public abstract class JAXBContext {
 
@@ -423,7 +423,7 @@ public abstract class JAXBContext {
      *   <li>failure to locate a value for the context factory provider property</li>
      *   <li>mixing schema derived packages from different providers on the same contextPath</li>
      * </ol>
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public static JAXBContext newInstance( String contextPath, ClassLoader classLoader, Map<String,?>  properties  )
         throws JAXBException {
@@ -497,7 +497,7 @@ public abstract class JAXBContext {
 //     * @throws IllegalArgumentException
 //     *      if the parameter contains {@code null} (i.e., {@code newInstance(null);})
 //     *
-//     * @since JAXB2.0
+//     * @since JAXB 2.0
 //     */
 //    public static JAXBContext newInstance( Source[] externalBindings, Class... classesToBeBound )
 //        throws JAXBException {
@@ -576,7 +576,7 @@ public abstract class JAXBContext {
      * @throws IllegalArgumentException
      *      if the parameter contains {@code null} (i.e., {@code newInstance(null);})
      *
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public static JAXBContext newInstance( Class... classesToBeBound )
         throws JAXBException {
@@ -622,7 +622,7 @@ public abstract class JAXBContext {
      * @throws IllegalArgumentException
      *      if the parameter contains {@code null} (i.e., {@code newInstance(null,someMap);})
      *
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public static JAXBContext newInstance( Class[] classesToBeBound, Map<String,?> properties )
         throws JAXBException {
@@ -692,7 +692,7 @@ public abstract class JAXBContext {
      *      if DOM API corresponding to <tt>domType</tt> is not supported by
      *      the implementation.
      *
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public <T> Binder<T> createBinder(Class<T> domType) {
         // to make JAXB 1.0 implementations work, this method must not be
@@ -705,7 +705,7 @@ public abstract class JAXBContext {
      *
      * @return always a new valid <tt>Binder</tt> object.
      *
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public Binder<Node> createBinder() {
         return createBinder(Node.class);
@@ -722,7 +722,7 @@ public abstract class JAXBContext {
      *      Calling this method on JAXB 1.0 implementations will throw
      *      an UnsupportedOperationException.
      *
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public JAXBIntrospector createJAXBIntrospector() {
         // to make JAXB 1.0 implementations work, this method must not be
@@ -744,7 +744,7 @@ public abstract class JAXBContext {
      *      Calling this method on JAXB 1.0 implementations will throw
      *      an UnsupportedOperationException.
      *
-     * @since JAXB 2.0
+     * @since 1.6, JAXB 2.0
      */
     public void generateSchema(SchemaOutputResolver outputResolver) throws IOException  {
         // to make JAXB 1.0 implementations work, this method must not be
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java
index fa240af7b0d85e4130f2ba5e283c9e2e2b7a3196..bc0b5281d5a9e5f4ebee74e7f55cca07525ee60e 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java
@@ -58,7 +58,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author Kohsuke Kawaguchi, Joe Fialli
- * @since JAXB 2.0
+ * @since 1.6, JAXB 2.0
  */
 
 public class JAXBElement<T> implements Serializable {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBException.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBException.java
index 218dceb7ae3382350fa4b6c4e3a3f35455970179..432f0531d3931b78e2ac3df8ab189a419ba4643e 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBException.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBException.java
@@ -34,7 +34,7 @@ import java.io.PrintWriter;
  * @see JAXBContext
  * @see Marshaller
  * @see Unmarshaller
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public class JAXBException extends Exception {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java
index 18a70ff6a3fad4eccf8b9f0b9583d3a36a464b8f..ed75427b442963a8e4513c5c521286ac95186f90 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java
@@ -41,7 +41,7 @@ import  javax.xml.namespace.QName;
  * {@link JAXBContext#createJAXBIntrospector()}.
  *
  * @see JAXBContext#createJAXBIntrospector()
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 public abstract class JAXBIntrospector {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java
index 05b83450798e1d67731c2688f5782ce2a1e7cf90..42dedafaaa64c983af79b8b8a2ece5e6edadf766 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java
@@ -73,7 +73,7 @@ import java.security.BasicPermission;
  * @see java.lang.SecurityManager
  *
  * @author Joe Fialli
- * @since JAXB 2.2
+ * @since 1.7, JAXB 2.2
  */
 
 /* code was borrowed originally from java.lang.RuntimePermission. */
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/MarshalException.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/MarshalException.java
index f944d1d05afc4af7a1995f3ea032f3c27e800018..e1f2cad20b81051c61f859c1c64cf3278d5baac6 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/MarshalException.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/MarshalException.java
@@ -38,7 +38,7 @@ package javax.xml.bind;
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
  * @see JAXBException
  * @see Marshaller
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public class MarshalException extends JAXBException {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/Marshaller.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/Marshaller.java
index 6a469039a060d41af661ab5c88cc342a8dc56988..abb410424792e8d31e6be45dd20d3c3cac34c65f 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/Marshaller.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/Marshaller.java
@@ -311,7 +311,7 @@ import java.io.File;
  * @see JAXBContext
  * @see Validator
  * @see Unmarshaller
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public interface Marshaller {
 
@@ -421,7 +421,7 @@ public interface Marshaller {
      *      Marshalling a JAXB element</a>.
      * @throws IllegalArgumentException
      *      If any of the method parameters are null
-     * @since JAXB2.1
+     * @since 1.6, JAXB 2.1
      */
     public void marshal( Object jaxbElement, File output )
         throws JAXBException;
@@ -515,7 +515,7 @@ public interface Marshaller {
      *      Marshalling a JAXB element</a>.
      * @throws IllegalArgumentException
      *      If any of the method parameters are null
-     * @since JAXB 2.0
+     * @since 1.6, JAXB 2.0
      */
     public void marshal( Object jaxbElement, javax.xml.stream.XMLStreamWriter writer )
         throws JAXBException;
@@ -539,7 +539,7 @@ public interface Marshaller {
      *      Marshalling a JAXB element</a>.
      * @throws IllegalArgumentException
      *      If any of the method parameters are null
-     * @since JAXB 2.0
+     * @since 1.6, JAXB 2.0
      */
     public void marshal( Object jaxbElement, javax.xml.stream.XMLEventWriter writer )
         throws JAXBException;
@@ -655,7 +655,7 @@ public interface Marshaller {
      *      if the adapter parameter is null.
      * @throws UnsupportedOperationException
      *      if invoked agains a JAXB 1.0 implementation.
-     * @since JAXB 2.0
+     * @since 1.6, JAXB 2.0
      */
     public void setAdapter( XmlAdapter adapter );
 
@@ -684,7 +684,7 @@ public interface Marshaller {
      *      if the type parameter is null.
      * @throws UnsupportedOperationException
      *      if invoked agains a JAXB 1.0 implementation.
-     * @since JAXB 2.0
+     * @since 1.6, JAXB 2.0
      */
     public <A extends XmlAdapter> void setAdapter( Class<A> type, A adapter );
 
@@ -697,7 +697,7 @@ public interface Marshaller {
      *      if the type parameter is null.
      * @throws UnsupportedOperationException
      *      if invoked agains a JAXB 1.0 implementation.
-     * @since JAXB 2.0
+     * @since 1.6, JAXB 2.0
      */
     public <A extends XmlAdapter> A getAdapter( Class<A> type );
 
@@ -730,7 +730,7 @@ public interface Marshaller {
      * @throws UnsupportedOperationException could be thrown if this method is
      *         invoked on an Marshaller created from a JAXBContext referencing
      *         JAXB 1.0 mapped classes
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public void setSchema( Schema schema );
 
@@ -745,7 +745,7 @@ public interface Marshaller {
      * @throws UnsupportedOperationException could be thrown if this method is
      *         invoked on an Marshaller created from a JAXBContext referencing
      *         JAXB 1.0 mapped classes
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public Schema getSchema();
 
@@ -766,7 +766,7 @@ public interface Marshaller {
      *
      * @see Marshaller#setListener(Listener)
      * @see Marshaller#getListener()
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public static abstract class Listener {
         /**
@@ -807,7 +807,7 @@ public interface Marshaller {
      * One can unregister current Listener by setting listener to <tt>null</tt>.
      *
      * @param listener an instance of a class that implements {@link Listener}
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public void setListener(Listener listener);
 
@@ -815,7 +815,7 @@ public interface Marshaller {
      * <p>Return {@link Listener} registered with this {@link Marshaller}.
      *
      * @return registered {@link Listener} or <code>null</code> if no Listener is registered with this Marshaller.
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public Listener getListener();
 }
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java
index f4820c96da131bc28cea61703b22398f3dc33ead..e2f547ed9c79a90299c4d6ad2e1e0db4f6ca3322 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java
@@ -32,7 +32,7 @@ package javax.xml.bind;
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
  * @see Validator
  * @see ValidationEventHandler
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public interface NotIdentifiableEvent extends ValidationEvent {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java
index b6ee5e6939997336b15cde88706edefa40c32212..4c900b49184db2dbfde9d2722cabfea0efb5d9ce 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java
@@ -33,7 +33,7 @@ package javax.xml.bind;
  * @see ValidationEvent
  * @see ValidationEventHandler
  * @see Unmarshaller
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public interface ParseConversionEvent extends ValidationEvent {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java
index c630cf62b08a4177749d2ebb698df29a53f61d2c..b9146f4e310b4c40c5d537c12d8184f591081ce5 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java
@@ -33,7 +33,7 @@ package javax.xml.bind;
  * @see ValidationEvent
  * @see ValidationEventHandler
  * @see Marshaller
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public interface PrintConversionEvent extends ValidationEvent {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/PropertyException.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/PropertyException.java
index 65613b84bd16cd9ee96149d37f1d97eb01b00d82..60860e9bac77074882d83d414d60af9fa4ca7c9c 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/PropertyException.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/PropertyException.java
@@ -35,7 +35,7 @@ package javax.xml.bind;
  * @see JAXBContext
  * @see Validator
  * @see Unmarshaller
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public class PropertyException extends JAXBException {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java
index f911107ba999fb2c883296e2bcb925833fe1516d..c39b78c870de5ea71333dbc58460973d5e623192 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java
@@ -42,6 +42,7 @@ import java.io.IOException;
  *
  * @author
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @since 1.6
  */
 public abstract class SchemaOutputResolver {
     /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java
index 24a295b8d028ebdbe7123b36098dbc25bed6bd6c..fa9ae393635da403a95b2885b18334ea476a2c4f 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java
@@ -42,7 +42,7 @@ package javax.xml.bind;
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
  * @see ValidationEvent
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 
 public class TypeConstraintException extends java.lang.RuntimeException {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java
index 88746597953992c1735fc3bb53c3d9b0eefca1e6..239675fce2b2388fe783a3e429da2abc34c48510 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java
@@ -40,7 +40,7 @@ package javax.xml.bind;
  * @see JAXBException
  * @see Unmarshaller
  * @see ValidationEventHandler
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public class UnmarshalException extends JAXBException {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java
index eb3090ab57b70979525076e0083949818312db79..19dfb6e6f4b3e84e2d8207e45e146eebd0cb7bc5 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java
@@ -404,7 +404,7 @@ import java.io.Reader;
  * @see JAXBContext
  * @see Marshaller
  * @see Validator
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public interface Unmarshaller {
 
@@ -474,7 +474,7 @@ public interface Unmarshaller {
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If the InputStream parameter is null
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public Object unmarshal( Reader reader ) throws JAXBException;
 
@@ -571,7 +571,7 @@ public interface Unmarshaller {
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If any parameter is null
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public <T> JAXBElement<T> unmarshal( org.w3c.dom.Node node, Class<T> declaredType ) throws JAXBException;
 
@@ -660,7 +660,7 @@ public interface Unmarshaller {
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If any parameter is null
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public <T> JAXBElement<T> unmarshal( javax.xml.transform.Source source, Class<T> declaredType )
         throws JAXBException;
@@ -696,7 +696,7 @@ public interface Unmarshaller {
      * @throws IllegalStateException
      *      If <tt>reader</tt> is not pointing to a START_DOCUMENT or
      *      START_ELEMENT  event.
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      * @see #unmarshal(javax.xml.stream.XMLStreamReader, Class)
      */
     public Object unmarshal( javax.xml.stream.XMLStreamReader reader )
@@ -731,7 +731,7 @@ public interface Unmarshaller {
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If any parameter is null
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public <T> JAXBElement<T> unmarshal( javax.xml.stream.XMLStreamReader reader, Class<T> declaredType ) throws JAXBException;
 
@@ -766,7 +766,7 @@ public interface Unmarshaller {
      * @throws IllegalStateException
      *      If <tt>reader</tt> is not pointing to a START_DOCUMENT or
      *      START_ELEMENT event.
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      * @see #unmarshal(javax.xml.stream.XMLEventReader, Class)
      */
     public Object unmarshal( javax.xml.stream.XMLEventReader reader )
@@ -802,7 +802,7 @@ public interface Unmarshaller {
      *     binding.  See <a href="#unmarshalEx">Unmarshalling XML Data</a>
      * @throws IllegalArgumentException
      *      If any parameter is null
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public <T> JAXBElement<T> unmarshal( javax.xml.stream.XMLEventReader reader, Class<T> declaredType ) throws JAXBException;
 
@@ -962,7 +962,7 @@ public interface Unmarshaller {
      * @throws UnsupportedOperationException could be thrown if this method is
      *         invoked on an Unmarshaller created from a JAXBContext referencing
      *         JAXB 1.0 mapped classes
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public void setSchema( javax.xml.validation.Schema schema );
 
@@ -986,7 +986,7 @@ public interface Unmarshaller {
      * @throws UnsupportedOperationException could be thrown if this method is
      *         invoked on an Unmarshaller created from a JAXBContext referencing
      *         JAXB 1.0 mapped classes
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public javax.xml.validation.Schema getSchema();
 
@@ -1001,7 +1001,7 @@ public interface Unmarshaller {
      *      if the adapter parameter is null.
      * @throws UnsupportedOperationException
      *      if invoked agains a JAXB 1.0 implementation.
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public void setAdapter( XmlAdapter adapter );
 
@@ -1030,7 +1030,7 @@ public interface Unmarshaller {
      *      if the type parameter is null.
      * @throws UnsupportedOperationException
      *      if invoked agains a JAXB 1.0 implementation.
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public <A extends XmlAdapter> void setAdapter( Class<A> type, A adapter );
 
@@ -1043,7 +1043,7 @@ public interface Unmarshaller {
      *      if the type parameter is null.
      * @throws UnsupportedOperationException
      *      if invoked agains a JAXB 1.0 implementation.
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public <A extends XmlAdapter> A getAdapter( Class<A> type );
 
@@ -1081,7 +1081,7 @@ public interface Unmarshaller {
      * (@link #setListener(Listener)}
      * (@link #getListener()}
      *
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public static abstract class Listener {
         /**
@@ -1128,7 +1128,7 @@ public interface Unmarshaller {
      * One can unregister current Listener by setting listener to <tt>null</tt>.
      *
      * @param listener  provides unmarshal event callbacks for this {@link Unmarshaller}
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public void     setListener(Listener listener);
 
@@ -1136,7 +1136,7 @@ public interface Unmarshaller {
      * <p>Return {@link Listener} registered with this {@link Unmarshaller}.
      *
      * @return registered {@link Listener} or <code>null</code> if no Listener is registered with this Unmarshaller.
-     * @since JAXB2.0
+     * @since 1.6, JAXB 2.0
      */
     public Listener getListener();
 }
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java
index 0f2c7954ad04be920852254ad62aedbd1fe8cae0..cf7f7452996b77c04f75ed256bedb13a3b8ba41f 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java
@@ -57,7 +57,7 @@ import org.xml.sax.ContentHandler;
  *
  * @author <ul><li>Kohsuke KAWAGUCHI, Sun Microsystems, Inc.</li></ul>
  * @see Unmarshaller#getUnmarshallerHandler()
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public interface UnmarshallerHandler extends ContentHandler
 {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java
index 5395904c234bd7ba1e85c088fc0456a685b3c056..9f21bf6c5e68ce0fff569a6604db611785df5f17 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java
@@ -34,7 +34,7 @@ package javax.xml.bind;
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
  * @see Validator
  * @see ValidationEventHandler
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public interface ValidationEvent {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java
index 76ed584241691645cab8762beeeb685f97ef38a5..1161fe89ba9e622a19b050d87a7318ce579800d9 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java
@@ -65,7 +65,7 @@ package javax.xml.bind;
  * @see Marshaller
  * @see ValidationEvent
  * @see javax.xml.bind.util.ValidationEventCollector
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public interface ValidationEventHandler {
     /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java
index c45327eae7e71180af8a888097680653299b56ed..e9b325d0f630c2f5b02a77661714c716bd339739 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java
@@ -40,7 +40,7 @@ package javax.xml.bind;
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
  * @see Validator
  * @see ValidationEvent
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public interface ValidationEventLocator {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationException.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationException.java
index 32f2223ba2b34bac51c82695be2edc7d444c9618..b06feb7777ee6fd00c197658cc31c3f0640f9a8a 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationException.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationException.java
@@ -38,7 +38,7 @@ package javax.xml.bind;
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
  * @see JAXBException
  * @see Validator
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public class ValidationException extends JAXBException {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/Validator.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/Validator.java
index 830c30aecbda3944fd83e0f910efac0267ba2c4a..18f7d6166c9b779996e4295304444014d6d054ae 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/Validator.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/Validator.java
@@ -154,7 +154,7 @@ package javax.xml.bind;
  * @see ValidationEventHandler
  * @see ValidationEvent
  * @see javax.xml.bind.util.ValidationEventCollector
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  * @deprecated since JAXB 2.0
  */
 public interface Validator {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java
index e9ab331101c7eab4f1a784faf8a66b2d868b7e25..97d7ccbe909fe84672795e8e898eddbd5d3b2a20 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java
@@ -49,7 +49,7 @@ import javax.xml.transform.Source;
  * be called from applications.
  *
  * @author Kohsuke Kawaguchi
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 public interface DomHandler<ElementT,ResultT extends Result> {
     /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java
index 113780e27f7bd0b8ffe0769e87b4e1ca0ef8f6e3..b5d973860f6c6da17fe999fd725aada2f6f94a95 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java
@@ -40,7 +40,7 @@ import javax.xml.transform.dom.DOMSource;
  * {@link DomHandler} implementation for W3C DOM (<code>org.w3c.dom</code> package.)
  *
  * @author Kohsuke Kawaguchi
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 public class W3CDomHandler implements DomHandler<Element,DOMResult> {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java
index 2235678ae0d52d1bc295f125ebaf2a1da1511051..ec38d4e29c060194182b4e35c3e42b1cdba861b3 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java
@@ -30,7 +30,7 @@ package javax.xml.bind.annotation;
  * fields in a JAXB bound class.
  *
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  * @see XmlAccessorOrder
  */
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java
index c53213a49cd2c32482604265f51ec9bcfdfd27dd..821c22446104257646d4ac42c8a5913ea09f85eb 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java
@@ -32,7 +32,7 @@ package javax.xml.bind.annotation;
  * properties.
  *
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  * @see XmlAccessorType
  */
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java
index a72a9d2a7d2b5e2b09f1d2491170283f3b3b0b5d..483849c16e36d8f9e4d4e8b32f2b8031444b9f78 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java
@@ -70,7 +70,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *    following annotations at the package level: {@link XmlJavaTypeAdapter}.
  *
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  * @see XmlAccessOrder
  */
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java
index e8f044f97c4a3a790b879bf9d900d5d38e9089b5..a4e5525c1516de1b07f7073eae1f4ad14f247150 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java
@@ -84,7 +84,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *    following annotations at the package level: {@link XmlJavaTypeAdapter}.
  *
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  * @see XmlAccessType
  */
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java
index bf1a6ad2075fb5f8e44ed8ff5cee5545248b787f..ff9c13778de153419aa9aa1ed1c7ff7a1cf2a37f 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java
@@ -66,7 +66,7 @@ import static java.lang.annotation.ElementType.METHOD;
  * map's key. The key's value is the String value of the attribute.
  *
  * @author Kohsuke Kawaguchi, Sun Microsystems, Inc.
- * @since JAXB2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME)
 @Target({FIELD,METHOD})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java
index 9613547c1dc0d0699477ac3a8d857ee2cf8acd19..3ca62ccd61b3d45ee16a6b11ac7e79211881586a 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java
index d15dc3691ef16addfcda173646de1dfe719dc797..e6cd4fcee935638decb8e6ac76735ae2fc338e63 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java
index 13f52547e3ce0aa785e03fa2a4beaffaaee19ec1..b37ca5d28986d2b57c4030d5d62ea10c2d89f1e7 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java
index 6f2c7e5afb9816dd28fd1f85e632abddcc46fbd0..5254769d26f591c40fa9515e363e03ad6ccde941 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java
index d5c558de122af69be35d3eaa242164a6e4dba273..00b6782d8e827ca52e0014ae9e0c709b9107ea7a 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java
index 0f5c7219d4ea5c9482015dd5f5dace95433eccb2..00be7a5cc15051f0583705ba4febde2aeefbd7ca 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java
+++ b/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;
 }
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java
index bb3633ed876b9be872f98e203a7eed0a8da31271..5f9b66c361b6696ff41960580d00417c7f95eac6 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java
index c6bebb2775f07a775b999a03767e4a6cf661454a..71aeec1141a60d62373f4f310c665639dd92eceb 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java
+++ b/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;
 }
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java
index 2e5384600cccc61bad939a419822eb4f2761bc1d..4d52a73c037b0bdac64de1ef4ae3a7f1900b35c2 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java
+++ b/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 {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java
index 544a21e12bbef05268406fe4bafb471aeb36e22c..f6059ffed9c6733782f09230bad0654d6ddd9d25 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java
index ea656abd7bb9f28d9b9a0970534b39e8bbf7e501..1948f3670a26765a6cd6b5adcb4587b4b7a3d731 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java
@@ -114,7 +114,7 @@ import static java.lang.annotation.ElementType.FIELD;
  *     &lt;/xs:simpleType>
  * </pre>
  *
- * @since JAXB 2.0
+ * @since 1.6, JAXB 2.0
  */
 @Retention(RUNTIME)
 @Target({FIELD})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java
index 13ce41d5ed14c79635c4ab06c5a8a63ecd23dd7d..8fc3542a5f8e03a2a2a7772332d0fd5c2b67cfcf 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java
index ef9e2c6bb9da2f31b21d3d6466f8c1e63df14701..5789dcc3d33cde1e0b0b176e3cb6c2aab6c5ef4c 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlInlineBinaryData.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlInlineBinaryData.java
index 9390b0e3de69cb88d42bc1a402078694b3417c89..d6beedba4a25131d0b681ccbd32164f9bc1a8ea2 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlInlineBinaryData.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java
index ef11b5b15f34287c21165c54f1dec0576fcb329d..0576e7f61da977d1df5812dce0f7db0cce107b74 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java
+++ b/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 {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMimeType.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMimeType.java
index 09506aae2608b3b4ac7cdbd19cb4df8a3a426d7d..c7fabf524c48353bf01f2a1ae65b9487b7c1e80b 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMimeType.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java
index 7b0462e61c0b3b23db9856ccfd8fafa86e78e40f..8259b59540f8339d5c80e8b4f26e1d2d0d43002e 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java
index dc92cc55a663fac29a9db532fa9dc34dd502730f..7625b5175cc8761be3bf86ec29649fa0377b413a 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java
+++ b/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({})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java
index 68670a9c1b3af6e71ab07bbe2e7082567c211d67..769df76146a7a8844819a35cd11da26bbb3267c7 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java
+++ b/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}
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java
index 1218061c051c3a21208c3f6a87ee9319a08c476a..61f5b520fb4d7c154753b93c7f1302843cb9e988 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java
+++ b/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)
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java
index 4216d4a8c9fc4acbf6ed947739a4e3ca78d84100..80506a4d05aaf8642561893f70bcd115a3629343 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java
index 80756f387ee3c135e98472482a312128dcb70a97..756c5f298e1c4ddb852d6cda116a86e66ab0c2df 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java
+++ b/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;
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java
index 7484cc1cbc8102ea42961b539cdd6fbc8d9d9794..eac31a6533f9b4c3952fb27be74b41acefbac9d2 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java
index d32a6218ed0dad7b01d8dd7228c55e55890f9244..deee2d408d61a605027a43126e286aa96ba57160 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java
+++ b/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 {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java
index 41bf41e3b2683d649b73a16e72813a97e36a76a7..02053ff2502eefaf3f3bde44c47799c5725b3445 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java
+++ b/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)
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java
index 730dea19228c860c1e27e7a114d84fb96af69439..fbd4d6eaa3ca0afc589ad5c5a037e0347f49711a 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java
index 3802f978c3a31ee7e00e526ff1792b81cbd94aff..0f4b250692726de8053953280cde70b8be645f29 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java
index dc18c2fcfe42f1245b51557ecc898ab9cd4dc550..ecf23aceb49365e8b210f9e8202f7a7f0c8d1abc 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java
+++ b/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})
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
index b9c1b7d314b74acaa483abcaaade667b22c70afc..9a589653c12c68223f39beb38340527910a2685c 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
+++ b/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> {
     /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
index 84704a68831da298717b64f8a8c4292428146962..153378a788dc99a8f53ca7deded28acec4d2677e 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
+++ b/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) {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
index 1ec0b11ca0ff3ddc26b6a5f3489c69863cf945c9..3c64dd48bb29a69d607fc336ac035b5421d90de3 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
+++ b/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> {
     /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlAdapter.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlAdapter.java
index 8a047de88473d070349ab916fa9dc81ca4b097bb..4ca79b0358d4694c553d0c88530938f36a9ba86a 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlAdapter.java
+++ b/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> {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
index ab0cf9493233814dd25e684968337e5e6400fa2d..a296ae8e50e4d0282aaf33e3f7b40feef475ac21 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
+++ b/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
  */
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
index c29493b42c801b6e9185c48d52817b2f8d186a79..6cebcf89dc9eed2e67a09d62bc11754c2b7f2e41 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
+++ b/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 {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/package.html b/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/package.html
index 5e6a2a3d65078d8fa1210c99e05d4c40b9828f09..57f80e44acdb3bc602aea4076688f93133b827bd 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/package.html
+++ b/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>
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java
index 8d4892b61a5ca51f2396194fd0c423e51b33c952..dd291917a708184b88e9c23a1193fff70d9518aa 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java
+++ b/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)
  *
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java
index 23d87215889415a284635ef60526a53947ddf18f..548f3c9bafe635d5710d2f54fc9524aa93f51341 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java
+++ b/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)
  *
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/package.html b/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/package.html
index 5dca81dbd1a5b5a7fc40d6301b8af205887a8375..c452cb9ad7f5d4ded5c5332687aa81558ec4ec6c 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/package.html
+++ b/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>
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java
index c2506d23a31010bdf202510f8304946c066d3662..35d47b6c1c37af5f81362f3aea7c35c7ffb28efb 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java
+++ b/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
 {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
index 37e040881c06a445c9102be9093cf2bb01be77a3..e51d6338a8e98bd45ba6e0758c4c639014fc92f5 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
+++ b/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
 {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java
index 7fe68ef8c4c400e3ae1aa4f56a65343ee1f1b2d0..b188eeaf1f39afaa431b0c8fc03f3e8ea1ce51f6 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java
@@ -52,7 +52,7 @@ import java.net.URL;
  * @see javax.xml.bind.Unmarshaller
  * @see javax.xml.bind.Validator
  * @see javax.xml.bind.ValidationEventHandler
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public class DefaultValidationEventHandler implements ValidationEventHandler {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
index e34c7889cac3bf67c15c7f3d8aa84172c440aea6..c6e5311761de570f4913053f34d385a1aedbb1cb 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
@@ -41,7 +41,7 @@ import javax.xml.bind.ValidationEventLocator;
  * @see javax.xml.bind.ValidationEventHandler
  * @see javax.xml.bind.ValidationEvent
  * @see javax.xml.bind.ValidationEventLocator
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public class NotIdentifiableEventImpl
     extends ValidationEventImpl
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java
index 92b504848b28812e02361c5955fcde0ca987a395..4cfa28e03099178aac4735bfdec6ed4c9d1f6adb 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java
@@ -42,7 +42,7 @@ import javax.xml.bind.ValidationEventLocator;
  * @see javax.xml.bind.ValidationEventHandler
  * @see javax.xml.bind.ValidationEvent
  * @see javax.xml.bind.ValidationEventLocator
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public class ParseConversionEventImpl
     extends ValidationEventImpl
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java
index 00de3b15a53aa01ff509d56d4f7a6be722045c94..37d63a02e8dccb1fcc53f4637980eca2d1838ece 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java
@@ -42,7 +42,7 @@ import javax.xml.bind.ValidationEventLocator;
  * @see javax.xml.bind.ValidationEventHandler
  * @see javax.xml.bind.ValidationEvent
  * @see javax.xml.bind.ValidationEventLocator
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public class PrintConversionEventImpl
     extends ValidationEventImpl
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java
index c357000617d0147fc28895ff42d6011f5e71add7..3b58bc5c9f0ed2430c79c5611ba306dde56f78c7 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java
@@ -43,7 +43,7 @@ import javax.xml.bind.ValidationEventLocator;
  * @see javax.xml.bind.ValidationEventHandler
  * @see javax.xml.bind.ValidationEvent
  * @see javax.xml.bind.ValidationEventLocator
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public class ValidationEventImpl implements ValidationEvent
 {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
index 36da72658eefabb1811b01a4b569ec79e5b62864..306b97773588319f3d709b6226e74789eb9c9321 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
@@ -47,7 +47,7 @@ import org.xml.sax.SAXParseException;
  * @see javax.xml.bind.ValidationEventHandler
  * @see javax.xml.bind.ValidationEvent
  * @see javax.xml.bind.ValidationEventLocator
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public class ValidationEventLocatorImpl implements ValidationEventLocator
 {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java
index fbf7caac727149934802d4dd4cdd96b87dccca54..7dabf4fab56c6e11d1bbd19036a0b5eccd6cf00b 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java
@@ -71,6 +71,7 @@ import javax.xml.transform.sax.SAXResult;
  *
  * @author
  *      Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @since 1.6
  */
 public class JAXBResult extends SAXResult {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java
index 515894615fd2717b850bb503dec33c836155dcf2..11b6c495c8227211565f3778b13ba0ec46ff103b 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java
@@ -87,6 +87,7 @@ import org.xml.sax.XMLFilter;
  *
  * @author
  *      Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @since 1.6
  */
 public class JAXBSource extends SAXSource {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java b/jaxws/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java
index 9cfd2abba16dcd532b6b7394806e7fcf50d096cc..48dfeea2f5c9b12b0d0a0a8c04bd9efa6e573c0c 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java
@@ -45,7 +45,7 @@ import java.util.List;
  * @see javax.xml.bind.ValidationEventHandler
  * @see javax.xml.bind.ValidationEvent
  * @see javax.xml.bind.ValidationEventLocator
- * @since JAXB1.0
+ * @since 1.6, JAXB 1.0
  */
 public class ValidationEventCollector implements ValidationEventHandler
 {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java
index aa0f8565b4f7fd5cfb623ef15a97896724012de1..ae3390c82c12a69ef747c848016e1a48411d3e53 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java
@@ -114,6 +114,8 @@ import javax.activation.DataHandler;
  * <PRE>
  *     ap1.clearContent();
  * </PRE>
+ *
+ * @since 1.6
  */
 
 public abstract class AttachmentPart {
@@ -190,7 +192,7 @@ public abstract class AttachmentPart {
      *      <code>AttachmentPart</code> object or if there was a data
      *      transformation error.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      * @see #getRawContentBytes
      */
     public abstract InputStream getRawContent() throws SOAPException;
@@ -208,7 +210,7 @@ public abstract class AttachmentPart {
      *      <code>AttachmentPart</code> object or if there was a data
      *      transformation error.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public abstract byte[] getRawContentBytes() throws SOAPException;
 
@@ -225,7 +227,7 @@ public abstract class AttachmentPart {
      *      <code>AttachmentPart</code> object or if there was a data
      *      transformation error.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public abstract InputStream getBase64Content() throws SOAPException;
 
@@ -267,7 +269,7 @@ public abstract class AttachmentPart {
      *
      * @exception SOAPException if an there is an error in setting the content
      * @exception NullPointerException if <code>content</code> is null
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public abstract void setRawContent(InputStream content, String contentType) throws SOAPException;
 
@@ -285,7 +287,7 @@ public abstract class AttachmentPart {
      *
      * @exception SOAPException if an there is an error in setting the content
      * or content is null
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public abstract void setRawContentBytes(
         byte[] content, int offset, int len,  String contentType)
@@ -309,7 +311,7 @@ public abstract class AttachmentPart {
      * @exception SOAPException if an there is an error in setting the content
      * @exception NullPointerException if <code>content</code> is null
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public abstract void setBase64Content(
         InputStream content, String contentType) throws SOAPException;
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java
index 62f9973702b5b57d090ec89872947c8ff2aaa6c9..d7d09bc34dc912933b57a2e9f7acdc919a30258b 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java
@@ -56,6 +56,8 @@ import javax.xml.namespace.QName;
  *    d.addDetailEntry(name);
  *    Iterator it = d.getDetailEntries();
  * </PRE>
+ *
+ * @since 1.6
  */
 public interface Detail extends SOAPFaultElement {
 
@@ -85,7 +87,7 @@ public interface Detail extends SOAPFaultElement {
      * DetailEntry object to this Detail object.
      *
      * @see Detail#addDetailEntry(Name name)
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public DetailEntry addDetailEntry(QName qname) throws SOAPException;
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java
index 6523ff660f3b81535b212fc6a8e72a947f228724..6643dcbf7a2378aeb9984d439605156c049f7bc0 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java
@@ -30,6 +30,8 @@ package javax.xml.soap;
  * a <code>SOAPFault</code> object.  A <code>DetailEntry</code> object,
  * which carries information about errors related to the <code>SOAPBody</code>
  * object that contains it, is application-specific.
+ *
+ * @since 1.6
  */
 public interface DetailEntry extends SOAPElement {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java
index 8501297f3dc347eeb793d0a75e6a0206206a4854..f2094daaa1b9b3ce7633c8968316d50e571ec2ce 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java
@@ -63,6 +63,8 @@ import java.io.InputStream;
  *        This method can be used internally by a service implementation to
  *        create a message that is a response to a request.
  * </UL>
+ *
+ * @since 1.6
  */
 public abstract class MessageFactory {
 
@@ -140,7 +142,7 @@ public abstract class MessageFactory {
      * @exception SOAPException if there was an error in creating the
      *            specified implementation of  <code>MessageFactory</code>.
      * @see SAAJMetaFactory
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static MessageFactory newInstance(String protocol) throws SOAPException {
         return SAAJMetaFactory.getInstance().newMessageFactory(protocol);
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java
index fa792036e37e43dedf52bbcf9e5935c8b3fd5df9..b1416e7f81304602dca023ea6a74769a7e449249 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java
@@ -32,6 +32,7 @@ package javax.xml.soap;
  * object.
  *
  * @see MimeHeaders
+ * @since 1.6
  */
 public class MimeHeader {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java
index 282d5b30e189340ae9b2ecf27bc046ceb1a4e030..b3ffa7681370f9777cce272e44c9aa1332155260 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java
@@ -39,6 +39,7 @@ import java.util.Vector;
  * API.
  * @see SOAPMessage#getAttachments
  * @see AttachmentPart
+ * @since 1.6
  */
 public class MimeHeaders {
     private Vector headers;
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java
index 6ef60c2f6ec723b91accd821769b921246f76e65..7c227f19eb35c098037e5c0b7c6319477421cf33 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java
@@ -73,6 +73,7 @@ package javax.xml.soap;
  * in favor of <code>javax.xml.namespace.QName<code>
  * @see SOAPEnvelope#createName(String, String, String) SOAPEnvelope.createName
  * @see SOAPFactory#createName(String, String, String) SOAPFactory.createName
+ * @since 1.6
  */
 public interface Name {
     /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java
index 4488d92f3f20b8a571a9efab9da0e25b8a37d9a1..1db693187cd9c445bd823a73fe2e5310f2f498d2 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java
@@ -30,6 +30,8 @@ package javax.xml.soap;
  * This interface extnends the standard DOM Node interface with methods for
  * getting and setting the value of a node, for
  * getting and setting the parent of a node, and for removing a node.
+ *
+ * @since 1.6
  */
 public interface Node extends org.w3c.dom.Node {
     /**
@@ -61,7 +63,7 @@ public interface Node extends org.w3c.dom.Node {
      *              node and either has more than one child node or has a child
      *              node that is not a <code>Text</code> node.
      *
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public void setValue(String value);
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJMetaFactory.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJMetaFactory.java
index e7fcf813aebc8ea16bc0945ef9a61e8b861f8d33..d6516fd33def1beb9249f90a4dbb3aecd436d459 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJMetaFactory.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJMetaFactory.java
@@ -38,7 +38,7 @@ package javax.xml.soap;
 * class.
 *
 * @author SAAJ RI Development Team
-* @since SAAJ 1.3
+* @since 1.6, SAAJ 1.3
 */
 
 public abstract class SAAJMetaFactory {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java
index 9899c81dd4adb2fc8ff17fd0a1128aad2e81cb12..f540940c1020bf56af889b7eddbb1ba4e0b5a411 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java
@@ -35,7 +35,7 @@ import javax.xml.transform.dom.DOMResult;
  *
  * @author XWS-Security Development Team
  *
- * @since SAAJ 1.3
+ * @since 1.6, SAAJ 1.3
  */
 public class SAAJResult extends DOMResult {
 
@@ -53,7 +53,7 @@ public class SAAJResult extends DOMResult {
      *
      * @throws SOAPException if there is a problem creating a <code>SOAPMessage</code>
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SAAJResult() throws SOAPException {
         this(MessageFactory.newInstance().createMessage());
@@ -79,7 +79,7 @@ public class SAAJResult extends DOMResult {
      * @throws SOAPException if a <code>SOAPMessage</code> supporting the
      *             specified protocol cannot be created
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SAAJResult(String protocol) throws SOAPException {
         this(MessageFactory.newInstance(protocol).createMessage());
@@ -99,7 +99,7 @@ public class SAAJResult extends DOMResult {
      *                  populated as a result of some transformation or
      *                  marshalling operation
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SAAJResult(SOAPMessage message) {
         super(message.getSOAPPart());
@@ -116,7 +116,7 @@ public class SAAJResult extends DOMResult {
      *
      * @param rootNode - the root to which the results will be appended
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SAAJResult(SOAPElement rootNode) {
         super(rootNode);
@@ -125,7 +125,7 @@ public class SAAJResult extends DOMResult {
 
     /**
      * @return the resulting Tree that was created under the specified root Node.
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public javax.xml.soap.Node getResult() {
         return (javax.xml.soap.Node)super.getNode().getFirstChild();
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java
index 7ef27aed41c261a02e14de9eb332f79c152ba593..ca4a9210f307cd7c8d1540c50fe579c2ccf241d1 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java
@@ -42,6 +42,7 @@ import javax.xml.namespace.QName;
  * error information, is an example of a <code>SOAPBodyElement</code> object.
  *
  * @see SOAPFault
+ * @since 1.6
  */
 public interface SOAPBody extends SOAPElement {
 
@@ -90,7 +91,7 @@ public interface SOAPBody extends SOAPElement {
      * @exception SOAPException if there is a SOAP error
      * @see SOAPFault#setFaultCode
      * @see SOAPFault#setFaultString
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public SOAPFault addFault(Name faultCode, String faultString, Locale locale) throws SOAPException;
 
@@ -127,7 +128,7 @@ public interface SOAPBody extends SOAPElement {
      * @see SOAPFault#setFaultString
      * @see SOAPBody#addFault(Name faultCode, String faultString, Locale locale)
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SOAPFault addFault(QName faultCode, String faultString, Locale locale)
         throws SOAPException;
@@ -164,7 +165,7 @@ public interface SOAPBody extends SOAPElement {
      *                if there is a SOAP error
      * @see SOAPFault#setFaultCode
      * @see SOAPFault#setFaultString
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public SOAPFault addFault(Name faultCode, String faultString)
         throws SOAPException;
@@ -202,7 +203,7 @@ public interface SOAPBody extends SOAPElement {
      * @see SOAPFault#setFaultCode
      * @see SOAPFault#setFaultString
      * @see SOAPBody#addFault(Name faultCode, String faultString)
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SOAPFault addFault(QName faultCode, String faultString)
         throws SOAPException;
@@ -252,7 +253,7 @@ public interface SOAPBody extends SOAPElement {
      * @exception SOAPException
      *                if a SOAP error occurs
      * @see SOAPBody#addBodyElement(Name)
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SOAPBodyElement addBodyElement(QName qname) throws SOAPException;
 
@@ -272,7 +273,7 @@ public interface SOAPBody extends SOAPElement {
      *         that was added.
      * @exception SOAPException
      *                if the <code>Document</code> cannot be added
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public SOAPBodyElement addDocument(org.w3c.dom.Document document)
         throws SOAPException;
@@ -290,7 +291,7 @@ public interface SOAPBody extends SOAPElement {
      *                if there is not exactly one child <code>SOAPElement</code> of the <code>
      *              <code>SOAPBody</code>.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public org.w3c.dom.Document extractContentAsDocument()
         throws SOAPException;
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java
index 7f0eb8db86a67a823588af422bac85f929d13a22..2fcec639180c11125958d10335b2f8e186ea603d 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java
@@ -38,6 +38,8 @@ package javax.xml.soap;
  * <PRE>
  *    SOAPBodyElement sbe = sb.addBodyElement(myName);
  * </PRE>
+ *
+ * @since 1.6
  */
 public interface SOAPBodyElement extends SOAPElement {
 }
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java
index ca06b1e7951fcf7d2ca1cc916fae0f2fe9e4138b..0151359b2afb95cb5400f4e612ad27c45fd5abd8 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java
@@ -45,6 +45,8 @@ package javax.xml.soap;
  * directly to a URL following the request/response paradigm.  That is,
  * messages are sent using the method <code>call</code>, which sends the
  * message and then waits until it gets a reply.
+ *
+ * @since 1.6
  */
 public abstract class SOAPConnection {
 
@@ -78,7 +80,7 @@ public abstract class SOAPConnection {
      * @return the <code>SOAPMessage</code> object that is the response to the
      *                  get message request
      * @throws SOAPException if there is a SOAP error
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SOAPMessage get(Object to)
                                 throws SOAPException {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnectionFactory.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnectionFactory.java
index c1e51f098c1e992b5bf1aeb97a233b63e4312e6f..849b5dc8be328044ea2f78a5a723d899aedca3bd 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnectionFactory.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnectionFactory.java
@@ -32,6 +32,8 @@ package javax.xml.soap;
  * SAAJ communication infrastructure. Otherwise {@link SOAPConnection} objects
  * can be created by calling <code>createConnection()</code> on the newly
  * created <code>SOAPConnectionFactory</code> object.
+ *
+ * @since 1.6
  */
 public abstract class SOAPConnectionFactory {
     /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java
index 8f5ae0b2dec6913ca37bdf895b38f6acf04a253e..fe84fcfa2e68e7534fa2416634633173fbdcebd7 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java
@@ -29,6 +29,8 @@ import javax.xml.namespace.QName;
 
 /**
  * The definition of constants pertaining to the SOAP protocol.
+ *
+ * @since 1.6
  */
 public interface SOAPConstants {
     /**
@@ -41,7 +43,7 @@ public interface SOAPConstants {
      * argument version of <code>createMessage</code>, an
      * <code>UnsupportedOperationException</code>.
      *
-     * @since  SAAJ 1.3
+     * @since  1.6, SAAJ 1.3
      */
     public static final String DYNAMIC_SOAP_PROTOCOL = "Dynamic Protocol";
 
@@ -49,7 +51,7 @@ public interface SOAPConstants {
      * Used to create <code>MessageFactory</code> instances that create
      * <code>SOAPMessages</code> whose behavior supports the SOAP 1.1  specification.
      *
-     * @since  SAAJ 1.3
+     * @since  1.6, SAAJ 1.3
      */
     public static final String SOAP_1_1_PROTOCOL = "SOAP 1.1 Protocol";
 
@@ -58,26 +60,26 @@ public interface SOAPConstants {
      * <code>SOAPMessages</code> whose behavior supports the SOAP 1.2
      * specification
      *
-     * @since  SAAJ 1.3
+     * @since  1.6, SAAJ 1.3
      */
     public static final String SOAP_1_2_PROTOCOL = "SOAP 1.2 Protocol";
 
     /**
      * The default protocol: SOAP 1.1 for backwards compatibility.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final String DEFAULT_SOAP_PROTOCOL = SOAP_1_1_PROTOCOL;
 
     /**
      * The namespace identifier for the SOAP 1.1 envelope.
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final String
                 URI_NS_SOAP_1_1_ENVELOPE = "http://schemas.xmlsoap.org/soap/envelope/";
     /**
      * The namespace identifier for the SOAP 1.2 envelope.
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final String
                 URI_NS_SOAP_1_2_ENVELOPE = "http://www.w3.org/2003/05/soap-envelope";
@@ -102,21 +104,21 @@ public interface SOAPConstants {
 
     /**
      * The namespace identifier for the SOAP 1.2 encoding.
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final String
         URI_NS_SOAP_1_2_ENCODING = "http://www.w3.org/2003/05/soap-encoding";
 
     /**
      * The media type  of the <code>Content-Type</code> MIME header in SOAP 1.1.
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final String
         SOAP_1_1_CONTENT_TYPE = "text/xml";
 
     /**
      * The media type  of the <code>Content-Type</code> MIME header in SOAP 1.2.
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final String
         SOAP_1_2_CONTENT_TYPE = "application/soap+xml";
@@ -137,21 +139,21 @@ public interface SOAPConstants {
      * The URI identifying the next application processing a SOAP request as the intended
      * role for a SOAP 1.2 header entry (see section 2.2 of part 1 of the SOAP 1.2
      * specification).
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final String
         URI_SOAP_1_2_ROLE_NEXT = URI_NS_SOAP_1_2_ENVELOPE + "/role/next";
 
     /**
      * The URI specifying the role None in SOAP 1.2.
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final String
         URI_SOAP_1_2_ROLE_NONE = URI_NS_SOAP_1_2_ENVELOPE + "/role/none";
 
     /**
      * The URI identifying the ultimate receiver of the SOAP 1.2 message.
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final String
         URI_SOAP_1_2_ROLE_ULTIMATE_RECEIVER =
@@ -159,41 +161,41 @@ public interface SOAPConstants {
 
     /**
      * The default namespace prefix for http://www.w3.org/2003/05/soap-envelope
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final String SOAP_ENV_PREFIX = "env";
 
     /**
      * SOAP 1.2 VersionMismatch Fault
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final QName SOAP_VERSIONMISMATCH_FAULT =
          new QName(URI_NS_SOAP_1_2_ENVELOPE, "VersionMismatch", SOAP_ENV_PREFIX);
 
     /**
      * SOAP 1.2 MustUnderstand Fault
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final QName SOAP_MUSTUNDERSTAND_FAULT =
          new QName(URI_NS_SOAP_1_2_ENVELOPE, "MustUnderstand", SOAP_ENV_PREFIX);
 
     /**
      * SOAP 1.2 DataEncodingUnknown Fault
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final QName SOAP_DATAENCODINGUNKNOWN_FAULT =
          new QName(URI_NS_SOAP_1_2_ENVELOPE, "DataEncodingUnknown", SOAP_ENV_PREFIX);
 
     /**
      * SOAP 1.2 Sender Fault
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final QName SOAP_SENDER_FAULT =
          new QName(URI_NS_SOAP_1_2_ENVELOPE, "Sender", SOAP_ENV_PREFIX);
 
     /**
      * SOAP 1.2 Receiver Fault
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static final QName SOAP_RECEIVER_FAULT =
          new QName(URI_NS_SOAP_1_2_ENVELOPE, "Receiver", SOAP_ENV_PREFIX);
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java
index 4a55a60b22c704ea708b10b973f86ec98a600e26..b4d8bca600662d12946784800cc2ef21cd6415bf 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java
@@ -40,6 +40,8 @@ import javax.xml.namespace.QName;
  * objects of the correct type. See {@link #getChildElements()} and
  * {@link <a HREF="package-summary.html#package_description">javax.xml.soap<a>}
  * for details.
+ *
+ * @since 1.6
  */
 public interface SOAPElement extends Node, org.w3c.dom.Element {
 
@@ -74,7 +76,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      * @exception SOAPException if there is an error in creating the
      *                          <code>SOAPElement</code> object
      * @see SOAPElement#addChildElement(Name)
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SOAPElement addChildElement(QName qname) throws SOAPException;
 
@@ -173,7 +175,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      * is also useful for recycling portions of a document within a SOAP
      * message.
      *
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public abstract void removeContents();
 
@@ -224,7 +226,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
                                 an attribute with <code>QName</code>
                                 <code>qname</code> on this SOAPElement.
      * @see SOAPElement#addAttribute(Name, String)
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SOAPElement addAttribute(QName qname, String value)
         throws SOAPException;
@@ -261,7 +263,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      * @return a <code>String</code> giving the value of the specified
      *         attribute, Null if there is no such attribute
      * @see SOAPElement#getAttributeValue(Name)
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public String getAttributeValue(QName qname);
 
@@ -287,7 +289,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      *
      * @return an iterator over the QNames of the attributes
      * @see SOAPElement#getAllAttributes()
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public Iterator getAllAttributesAsQNames();
 
@@ -322,7 +324,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      * @return an iterator over the namespace prefixes are within scope of this
      *         <code>SOAPElement</code> object
      *
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public Iterator getVisibleNamespacePrefixes();
 
@@ -348,7 +350,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      *
      * @exception SOAPException if the <code>QName</code> cannot be created.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public QName createQName(String localName, String prefix)
         throws SOAPException;
@@ -366,7 +368,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      * @return a <code>QName</code> object with the qname of this
      *         <code>SOAPElement</code> object
      * @see SOAPElement#getElementName()
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public QName getElementQName();
 
@@ -386,7 +388,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
     *                          is not allowed.
     * @return The renamed Node
     *
-    * @since SAAJ 1.3
+    * @since 1.6, SAAJ 1.3
     */
    public SOAPElement setElementQName(QName newName) throws SOAPException;
 
@@ -409,7 +411,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      * @return <code>true</code> if the attribute was
      *         removed successfully; <code>false</code> if it was not
      * @see SOAPElement#removeAttribute(Name)
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public boolean removeAttribute(QName qname);
 
@@ -496,7 +498,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      *         in this <code>SOAPElement</code> object with the
      *         specified qname
      * @see SOAPElement#getChildElements(Name)
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public Iterator getChildElements(QName qname);
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java
index ff6a8ddf314f8af9c51b9253f26a697d0e704feb..a45a3db59e82036007084a475c9b5c0a1b6e8d32 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java
@@ -37,6 +37,7 @@ package javax.xml.soap;
  * inserted.
  * @deprecated - Use <code>javax.xml.soap.SOAPFactory</code> for creating SOAPElements.
  * @see javax.xml.soap.SOAPFactory
+ * @since 1.6
  */
 public class SOAPElementFactory {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java
index 0839e7fbe2384635ef79a94e0f6d3f6ed484ba33..a32d535f3ec27af18122a93270226920b2425b19 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java
@@ -93,6 +93,8 @@ package javax.xml.soap;
  *     Name name = se.createName("GetLastTradePrice", "WOMBAT",
  *                                "http://www.wombat.org/trader");
  * </PRE>
+ *
+ * @since 1.6
  */
 public interface SOAPEnvelope extends SOAPElement {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java
index 333c772e9e0071c94c4b81d8bac46545961569e0..669130204e94b4568ea74f0b990b48ca26184f16 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java
@@ -39,6 +39,8 @@ package javax.xml.soap;
  * the provider.  Reasons for embedding a <code>Throwable</code>
  * object include problems such as input/output errors or a parsing
  * problem, such as an error in parsing a header.
+ *
+ * @since 1.6
  */
 public class SOAPException extends Exception {
     private Throwable cause;
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java
index 5f8778e7e5b289bceaa8430f7958578ed648955d..c32f6926519f0f31b03dbb754e8f4d5cfc9c473a 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java
@@ -43,6 +43,7 @@ import org.w3c.dom.Element;
  * <code>javax.xml.soap.Detail</code> objects as well as
  * <code>java.xml.soap.Name</code> objects.
  *
+ * @since 1.6
  */
 public abstract class SOAPFactory {
 
@@ -77,7 +78,7 @@ public abstract class SOAPFactory {
      * @exception SOAPException if there is an error in creating the
      *            <code>SOAPElement</code> object
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SOAPElement createElement(Element domElement) throws SOAPException {
         throw new UnsupportedOperationException("createElement(org.w3c.dom.Element) must be overridden by all subclasses of SOAPFactory.");
@@ -120,7 +121,7 @@ public abstract class SOAPFactory {
      * @exception SOAPException if there is an error in creating the
      *            <code>SOAPElement</code> object
      * @see SOAPFactory#createElement(Name)
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public  SOAPElement createElement(QName qname) throws SOAPException {
         throw new UnsupportedOperationException("createElement(QName) must be overridden by all subclasses of SOAPFactory.");
@@ -188,7 +189,7 @@ public abstract class SOAPFactory {
      *@param faultCode the FaultCode for the fault
      *@return a <code>SOAPFault</code> object
      *@throws SOAPException if there is a SOAP error
-     *@since SAAJ 1.3
+     *@since 1.6, SAAJ 1.3
      */
     public abstract SOAPFault createFault(String reasonText, QName faultCode) throws SOAPException;
 
@@ -196,7 +197,7 @@ public abstract class SOAPFactory {
      *Creates a new default <code>SOAPFault</code> object
      *@return a <code>SOAPFault</code> object
      *@throws SOAPException if there is a SOAP error
-     *@since SAAJ 1.3
+     *@since 1.6, SAAJ 1.3
      */
     public abstract SOAPFault createFault() throws SOAPException;
 
@@ -290,7 +291,7 @@ public abstract class SOAPFactory {
      * @exception SOAPException if there was an error creating the
      *            specified <code>SOAPFactory</code>
      * @see SAAJMetaFactory
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public static SOAPFactory newInstance(String protocol)
         throws SOAPException {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java
index ee05dfc2d6dd32fabd181d0c6db46c46d2d97f44..67d3c6004d34d05cb14086dc681931c3341f1272 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java
@@ -42,6 +42,8 @@ import javax.xml.namespace.QName;
  * Depending on the <code>protocol</code> specified while creating the
  * <code>MessageFactory</code> instance,  a <code>SOAPFault</code> has
  * sub-elements as defined in the SOAP 1.1/SOAP 1.2 specification.
+ *
+ * @since 1.6
  */
 public interface SOAPFault extends SOAPBodyElement {
 
@@ -72,7 +74,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @exception SOAPException if there was an error in adding the
      *            <i>faultcode</i> element to the underlying XML tree.
      *
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public void setFaultCode(Name faultCodeQName) throws SOAPException;
 
@@ -91,7 +93,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @see #setFaultCode(Name)
      * @see #getFaultCodeAsQName()
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public void setFaultCode(QName faultCodeQName) throws SOAPException;
 
@@ -128,7 +130,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @return a <code>Name</code> representing the faultcode
      * @see #setFaultCode(Name)
      *
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public Name getFaultCodeAsName();
 
@@ -141,7 +143,7 @@ public interface SOAPFault extends SOAPBodyElement {
      *
      * @see #setFaultCode(QName)
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public QName getFaultCodeAsQName();
 
@@ -158,7 +160,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @exception UnsupportedOperationException if this message does not
      *      support the SOAP 1.2 concept of Subcode.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public Iterator getFaultSubcodes();
 
@@ -171,7 +173,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @exception UnsupportedOperationException if this message does not
      *      support the SOAP 1.2 concept of Subcode.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public void removeAllFaultSubcodes();
 
@@ -187,7 +189,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @exception UnsupportedOperationException if this message does not
      *      support the SOAP 1.2 concept of Subcode.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public void appendFaultSubcode(QName subcode) throws SOAPException;
 
@@ -270,7 +272,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @exception SOAPException if there was an error in adding the
      *            <code>faultString</code> to the underlying XML tree.
      *
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public void setFaultString(String faultString, Locale locale)
         throws SOAPException;
@@ -315,7 +317,7 @@ public interface SOAPFault extends SOAPBodyElement {
      *          the fault string or <code>null</code> if no locale was specified
      * @see #setFaultString(String, Locale)
      *
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public Locale getFaultStringLocale();
 
@@ -327,7 +329,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @return true if this <code>SOAPFault</code> has a <code>Detail</code>
      * subelement and false otherwise.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public boolean hasDetail();
 
@@ -377,7 +379,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @exception UnsupportedOperationException if this message does not
      *      support the SOAP 1.2 concept of Fault Reason.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public Iterator getFaultReasonLocales() throws SOAPException;
 
@@ -393,7 +395,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @exception UnsupportedOperationException if this message does not
      *      support the SOAP 1.2 concept of Fault Reason.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public Iterator getFaultReasonTexts() throws SOAPException;
 
@@ -414,7 +416,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @exception UnsupportedOperationException if this message does not
      *      support the SOAP 1.2 concept of Fault Reason.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public String getFaultReasonText(Locale locale) throws SOAPException;
 
@@ -441,7 +443,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @exception UnsupportedOperationException if this message does not
      *      support the SOAP 1.2 concept of Fault Reason.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public void addFaultReasonText(String text, java.util.Locale locale)
         throws SOAPException;
@@ -457,7 +459,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @exception UnsupportedOperationException if this message does not
      *      support the SOAP 1.2 concept of Fault Node.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public String getFaultNode();
 
@@ -472,7 +474,7 @@ public interface SOAPFault extends SOAPBodyElement {
      *      support the SOAP 1.2 concept of Fault Node.
      *
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public void setFaultNode(String uri) throws SOAPException;
 
@@ -487,7 +489,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @exception UnsupportedOperationException if this message does not
      *      support the SOAP 1.2 concept of Fault Role.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public String getFaultRole();
 
@@ -504,7 +506,7 @@ public interface SOAPFault extends SOAPBodyElement {
      * @exception UnsupportedOperationException if this message does not
      *      support the SOAP 1.2 concept of Fault Role.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public void setFaultRole(String uri) throws SOAPException;
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java
index f89b4c0439391b3b47365925cf67413ae469358c..fcf3a02f80d2f2a2b11456d7abfffb77cfb89172 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java
@@ -32,6 +32,8 @@ package javax.xml.soap;
  * <P>
  * Content is added to a <code>SOAPFaultElement</code> using the
  * <code>SOAPElement</code> method <code>addTextNode</code>.
+ *
+ * @since 1.6
  */
 public interface SOAPFaultElement extends SOAPElement {
 }
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java
index dd10957f0ed181e0ab9b20b13391a5623de77bd2..870b423c70b9231d11af97afb95ea857b8cefbc4 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java
@@ -66,6 +66,7 @@ import javax.xml.namespace.QName;
  * </PRE>
  *
  * @see SOAPHeaderElement
+ * @since 1.6
  */
 public interface SOAPHeader extends SOAPElement {
     /**
@@ -92,7 +93,7 @@ public interface SOAPHeader extends SOAPElement {
      *          inserted into this <code>SOAPHeader</code> object
      * @exception SOAPException if a SOAP error occurs
      * @see SOAPHeader#addHeaderElement(Name)
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SOAPHeaderElement addHeaderElement(QName qname)
         throws SOAPException;
@@ -115,7 +116,7 @@ public interface SOAPHeader extends SOAPElement {
      * @see #extractHeaderElements
      * @see SOAPConstants#URI_SOAP_ACTOR_NEXT
      *
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public Iterator examineMustUnderstandHeaderElements(String actor);
 
@@ -180,7 +181,7 @@ public interface SOAPHeader extends SOAPElement {
      *          inserted into this <code>SOAPHeader</code> object
      * @exception SOAPException if a SOAP error occurs.
      * @exception UnsupportedOperationException if this is a SOAP 1.1 Header.
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SOAPHeaderElement addNotUnderstoodHeaderElement(QName name)
         throws SOAPException;
@@ -196,7 +197,7 @@ public interface SOAPHeader extends SOAPElement {
      * @return the new <code>SOAPHeaderElement</code> object that was
      *          inserted into this <code>SOAPHeader</code> object
      * @exception SOAPException if a SOAP error occurs.
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SOAPHeaderElement addUpgradeHeaderElement(Iterator supportedSOAPURIs)
         throws SOAPException;
@@ -211,7 +212,7 @@ public interface SOAPHeader extends SOAPElement {
      * @return the new <code>SOAPHeaderElement</code> object that was
      *          inserted into this <code>SOAPHeader</code> object
      * @exception SOAPException if a SOAP error occurs.
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SOAPHeaderElement addUpgradeHeaderElement(String[] supportedSoapUris)
         throws SOAPException;
@@ -226,7 +227,7 @@ public interface SOAPHeader extends SOAPElement {
      * @return the new <code>SOAPHeaderElement</code> object that was
      *          inserted into this <code>SOAPHeader</code> object
      * @exception SOAPException if a SOAP error occurs.
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public SOAPHeaderElement addUpgradeHeaderElement(String supportedSoapUri)
         throws SOAPException;
@@ -240,7 +241,7 @@ public interface SOAPHeader extends SOAPElement {
      *          <code>SOAPHeader</code>
      * @see #extractAllHeaderElements
      *
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public Iterator examineAllHeaderElements();
 
@@ -255,7 +256,7 @@ public interface SOAPHeader extends SOAPElement {
      *
      * @see #examineAllHeaderElements
      *
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public Iterator extractAllHeaderElements();
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java
index 29f331964fcb3ed06120b8d3c57fad838b702413..f6755f1c372616c20d2ceae3965b83b7c8a3abc0 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java
@@ -33,6 +33,8 @@ package javax.xml.soap;
  * <P>
  * A <code>SOAPHeaderElement</code> object can have other
  * <code>SOAPElement</code> objects as its children.
+ *
+ * @since 1.6
  */
 public interface SOAPHeaderElement extends SOAPElement {
 
@@ -65,7 +67,7 @@ public interface SOAPHeaderElement extends SOAPElement {
      * @exception UnsupportedOperationException if this message does not
      *      support the SOAP 1.2 concept of Fault Role.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public void setRole(String uri) throws SOAPException;
 
@@ -89,7 +91,7 @@ public interface SOAPHeaderElement extends SOAPElement {
      * @exception UnsupportedOperationException if this message does not
      *      support the SOAP 1.2 concept of Fault Role.
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public String getRole();
 
@@ -143,7 +145,7 @@ public interface SOAPHeaderElement extends SOAPElement {
      * @see #setMustUnderstand
      * @see #getRelay
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public void setRelay(boolean relay) throws SOAPException;
 
@@ -160,7 +162,7 @@ public interface SOAPHeaderElement extends SOAPElement {
      * @see #getMustUnderstand
      * @see #setRelay
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public boolean getRelay();
 }
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java
index a86f73865b168a2104d657c43229a46b469f2e76..821c64817e95f6f470cd7a3c7f8527d0f75c1fb9 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java
@@ -100,6 +100,7 @@ import javax.activation.DataHandler;
  *
  * @see MessageFactory
  * @see AttachmentPart
+ * @since 1.6
  */
 public abstract class SOAPMessage {
     /**
@@ -108,7 +109,7 @@ public abstract class SOAPMessage {
          * supported values. The default is "utf-8".
          *
          * @see SOAPMessage#setProperty(String, Object) SOAPMessage.setProperty
-         * @since SAAJ 1.2
+         * @since 1.6, SAAJ 1.2
          */
     public static final String CHARACTER_SET_ENCODING =
         "javax.xml.soap.character-set-encoding";
@@ -119,7 +120,7 @@ public abstract class SOAPMessage {
      * "false".
      *
      * @see SOAPMessage#setProperty(String, Object) SOAPMessage.setProperty
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public static final String WRITE_XML_DECLARATION =
         "javax.xml.soap.write-xml-declaration";
@@ -163,7 +164,7 @@ public abstract class SOAPMessage {
          *         object
          * @exception SOAPException
          *               if the SOAP Body does not exist or cannot be retrieved
-         * @since SAAJ 1.2
+         * @since 1.6, SAAJ 1.2
          */
     public SOAPBody getSOAPBody() throws SOAPException {
         throw new UnsupportedOperationException("getSOAPBody must be overridden by all subclasses of SOAPMessage");
@@ -178,7 +179,7 @@ public abstract class SOAPMessage {
          *         object
          * @exception SOAPException
          *               if the SOAP Header does not exist or cannot be retrieved
-         * @since SAAJ 1.2
+         * @since 1.6, SAAJ 1.2
          */
     public SOAPHeader getSOAPHeader() throws SOAPException {
         throw new UnsupportedOperationException("getSOAPHeader must be overridden by all subclasses of SOAPMessage");
@@ -230,7 +231,7 @@ public abstract class SOAPMessage {
      * @param headers
      *           a <code>MimeHeaders</code> object containing the MIME
      *           headers for which to search
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public abstract void removeAttachments(MimeHeaders headers);
 
@@ -258,7 +259,7 @@ public abstract class SOAPMessage {
      * @throws SOAPException if there is an error in the attempt to access the
      *          attachment
      *
-     * @since SAAJ 1.3
+     * @since 1.6, SAAJ 1.3
      */
     public abstract AttachmentPart getAttachment(SOAPElement element) throws SOAPException;
 
@@ -432,7 +433,7 @@ public abstract class SOAPMessage {
      *           the value to be associated with the specified property
      * @exception SOAPException
      *               if the property name is not recognized.
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public void setProperty(String property, Object value)
         throws SOAPException {
@@ -448,7 +449,7 @@ public abstract class SOAPMessage {
      *         if no such property exists.
      * @exception SOAPException
      *               if the property name is not recognized.
-     * @since SAAJ 1.2
+     * @since 1.6, SAAJ 1.2
      */
     public Object getProperty(String property) throws SOAPException {
         throw new UnsupportedOperationException("getProperty must be overridden by all subclasses of SOAPMessage");
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java
index ab605b6f757c9395b95e8ca134969dc7ce9ef477..dc280fab60eea62988e78b0a0b137080f110b24e 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java
@@ -64,6 +64,8 @@ import javax.xml.transform.Source;
  * The <code>SOAPPart</code> method <code>getEnvelope</code> can be used
  * to retrieve the <code>SOAPEnvelope</code> object.
  * <P>
+ *
+ * @since 1.6
  */
 public abstract class SOAPPart implements org.w3c.dom.Document, Node {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java b/jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java
index c385e1646d561233ed1d8c3293128872ade1dc55..49f0e2cb19f5bf52a7cf16444d9e418f0c18be96 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java
@@ -29,6 +29,7 @@ package javax.xml.soap;
  * A representation of a node whose value is text.  A <code>Text</code> object
  * may represent text that is content or text that is a comment.
  *
+ * @since 1.6
  */
 public interface Text extends Node, org.w3c.dom.Text {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Action.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/Action.java
index daadc48d1f673aba92dece042a97050eb4477581..f42190b295e8fabf0a3a9a5565f3cde9855275d8 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/Action.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/Action.java
@@ -118,7 +118,7 @@ import java.lang.annotation.Target;
  *
  * @see FaultAction
  *
- * @since JAX-WS 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 
 @Documented
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/AsyncHandler.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/AsyncHandler.java
index 6f553b0a5c687e0c9543ca69dfaba3f87068b731..66acc97af2613de3d0bfbf16ceaaf113b9ec9a78 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/AsyncHandler.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/AsyncHandler.java
@@ -29,7 +29,7 @@ package javax.xml.ws;
  * clients that wish to receive callback notification of the completion of
  * service endpoint operations invoked asynchronously.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface AsyncHandler<T> {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Binding.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/Binding.java
index 9c92f1eed968434b76817465e7814bdd60af39f2..24be0222c67b25bfe0feee18da1eda88abe10f49 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/Binding.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/Binding.java
@@ -29,7 +29,7 @@ package javax.xml.ws;
 /** The <code>Binding</code> interface is the base interface
  *  for JAX-WS protocol bindings.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface Binding {
 
@@ -61,7 +61,7 @@ public interface Binding {
      * @return String The binding identifier for the port.
      *    Never returns <code>null</code>
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      */
     String getBindingID();
 }
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/BindingProvider.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/BindingProvider.java
index bac4d26ccd94a81196fd7d22c4d328e108ea7d19..11194fd5078ff86977a771c634514ba8658bee08 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/BindingProvider.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/BindingProvider.java
@@ -33,7 +33,7 @@ import javax.xml.ws.wsaddressing.W3CEndpointReference;
  * protocol binding and associated context objects for request and
  * response message processing.
  *
- * @since JAX-WS 2.0
+ * @since 1.6, JAX-WS 2.0
  *
  * @see javax.xml.ws.Binding
  **/
@@ -154,7 +154,7 @@ public interface BindingProvider {
      *
      * @see W3CEndpointReference
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      */
     public EndpointReference getEndpointReference();
 
@@ -176,7 +176,7 @@ public interface BindingProvider {
      * @throws java.lang.UnsupportedOperationException If this
      * <code>BindingProvider</code> uses the XML/HTTP binding.
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      */
     public <T extends EndpointReference> T getEndpointReference(Class<T> clazz);
 }
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/BindingType.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/BindingType.java
index 29ce875728706671e56cabd89c9fffd9c2d415b6..0976add7606e2f320eb50a8fb018eb3929a2f74d 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/BindingType.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/BindingType.java
@@ -39,7 +39,7 @@ import java.lang.annotation.RetentionPolicy;
  *  This annotation may be overriden programmatically or via
  *  deployment descriptors, depending on the platform in use.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
  *
  **/
 @Target(ElementType.TYPE)
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Dispatch.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/Dispatch.java
index f1f38a3588356ce2313ef00dcc5e5c48b7f9bf16..7c96bab57d876ea66c307ebae01d75bc0bf7415f 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/Dispatch.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/Dispatch.java
@@ -33,7 +33,7 @@ import java.util.concurrent.Future;
  *  class acts as a factory for the creation of <code>Dispatch</code>
  *  instances.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface Dispatch<T> extends BindingProvider {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Endpoint.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/Endpoint.java
index 484c6510e43fc717031dc7b1bb68ddb27ecbc245..1cb19ea159054f048fa731c4fc811f3f463284a1 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/Endpoint.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/Endpoint.java
@@ -61,7 +61,7 @@ import org.w3c.dom.Element;
  * as possible instead of generating new ones based on the annotations
  * present on the implementor.
  *
- * @since JAX-WS 2.0
+ * @since 1.6, JAX-WS 2.0
  *
  * @see javax.xml.ws.Binding
  * @see javax.xml.ws.BindingType
@@ -119,7 +119,7 @@ public abstract class Endpoint {
      *
      *
      * @return The newly created endpoint.
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      *
      */
     public static Endpoint create(Object implementor, WebServiceFeature ... features) {
@@ -166,7 +166,7 @@ public abstract class Endpoint {
      *        </code> parameter will have their default values.
      *
      * @return The newly created endpoint.
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public static Endpoint create(String bindingId, Object implementor, WebServiceFeature ... features) {
         return Provider.provider().createEndpoint(bindingId, implementor, features);
@@ -266,7 +266,7 @@ public abstract class Endpoint {
      *          If a <code>java.lang.SecurityManger</code>
      *          is being used and the application doesn't have the
      *          <code>WebServicePermission("publishEndpoint")</code> permission.
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public static Endpoint publish(String address, Object implementor, WebServiceFeature ... features) {
         return Provider.provider().createAndPublishEndpoint(address, implementor, features);
@@ -330,7 +330,7 @@ public abstract class Endpoint {
      *          If a <code>java.lang.SecurityManger</code>
      *          is being used and the application doesn't have the
      *          <code>WebServicePermission("publishEndpoint")</code> permission.
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public void publish(HttpContext serverContext) {
         throw new UnsupportedOperationException("JAX-WS 2.2 implementation must override this default behaviour.");
@@ -446,7 +446,7 @@ public abstract class Endpoint {
      *
      * @see W3CEndpointReference
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public abstract EndpointReference getEndpointReference(Element... referenceParameters);
 
@@ -472,7 +472,7 @@ public abstract class Endpoint {
      * uses the XML/HTTP binding.
      *
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public abstract <T extends EndpointReference> T getEndpointReference(Class<T> clazz,
             Element... referenceParameters);
@@ -490,7 +490,7 @@ public abstract class Endpoint {
      * @throws java.lang.IllegalStateException
      *        If the endpoint has been published already or it has been stopped.
      *
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public void setEndpointContext(EndpointContext ctxt) {
         throw new UnsupportedOperationException("JAX-WS 2.2 implementation must override this default behaviour.");
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointContext.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointContext.java
index 13bc527fc2162d7854bba2124a91ad606b8e61bc..b1a4b49db596cfdc68fcc16c2f8bcc7d3b9bab1b 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointContext.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointContext.java
@@ -42,7 +42,7 @@ import java.util.Set;
  * before {@link Endpoint#publish} methods.
  *
  * @author Jitendra Kotamraju
- * @since JAX-WS 2.2
+ * @since 1.7, JAX-WS 2.2
  */
 public abstract class EndpointContext {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointReference.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointReference.java
index 6ef626b4d1731c8b8ecfdf4f5896e69e1621096a..3ed68c0511f14f91628872cb2b0504a49817ec5a 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointReference.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointReference.java
@@ -81,7 +81,7 @@ import java.io.StringWriter;
  *
  * @see W3CEndpointReference
  * @see Service
- * @since JAX-WS 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 @XmlTransient // to treat this class like Object as far as databinding is concerned (proposed JAXB 2.1 feature)
 public abstract class EndpointReference {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/FaultAction.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/FaultAction.java
index 0e29a0aa85852c2decb23bfe0e3d410b197705b6..43e37f608ea4a0dfcde63ee185fa0e146f20b10b 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/FaultAction.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/FaultAction.java
@@ -145,7 +145,7 @@ import java.lang.annotation.Target;
  *   &lt;/definitions>
  * </pre>
  *
- * @since JAX-WS 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 
 @Documented
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Holder.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/Holder.java
index 8eddf0575f9a00093399181174ef706df11ea7a1..8f58f34eda1d7509d5726ea8b25c18859430db30 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/Holder.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/Holder.java
@@ -30,7 +30,7 @@ import java.io.Serializable;
 /**
  * Holds a value of type <code>T</code>.
  *
- * @since JAX-WS 2.0
+ * @since 1.6, JAX-WS 2.0
  */
 public final class Holder<T> implements Serializable {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/LogicalMessage.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/LogicalMessage.java
index 19b5be1dfd0396a86a9c72afcedd44e6f6279380..4f50c1604b55d51f77355bc85429919dbad7a0ff 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/LogicalMessage.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/LogicalMessage.java
@@ -32,7 +32,7 @@ import javax.xml.bind.JAXBContext;
  *  protocol agnostic XML message and contains methods that
  *  provide access to the payload of the message.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface LogicalMessage {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/ProtocolException.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/ProtocolException.java
index 16ba0dae50d7267dc11db17491d67465d7d2260c..5ea3926db9f66836e2ba6307ad51e750a57a9a4f 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/ProtocolException.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/ProtocolException.java
@@ -30,7 +30,7 @@ package javax.xml.ws;
  *  are used to communicate protocol level fault information to clients and may
  *  be used on the server to control the protocol specific fault representation.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public class ProtocolException extends WebServiceException {
     /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Provider.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/Provider.java
index 79d26450baa7f6dc703adcaa2b1aeffbe03cc651..78c7b717948743ad6c986378d01ea72f899f58d4 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/Provider.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/Provider.java
@@ -38,7 +38,7 @@ package javax.xml.ws;
  *  the <code>Provider</code> instance will receive entire protocol messages
  *  or just message payloads.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
  *
  *  @see javax.xml.transform.Source
  *  @see javax.xml.soap.SOAPMessage
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/RequestWrapper.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/RequestWrapper.java
index a33af7c3d3375f7ce50c0d6869100679d650eddb..34b6b6a33d44ee529cc6d795f579151bcb74d581 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/RequestWrapper.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/RequestWrapper.java
@@ -40,7 +40,7 @@ import java.lang.annotation.RetentionPolicy;
  * overloading conflicts in document literal mode. Only the <code>className</code>
  * is required in this case.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
  **/
 
 @Target(ElementType.METHOD)
@@ -65,7 +65,7 @@ public @interface RequestWrapper {
     /**
      * wsdl:part name for the wrapper part
      *
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public String partName() default "";
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBinding.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBinding.java
index c71a3215e9a18fb6228b436bcb14914e20f1e721..e5357873ec1ea2d3e57dbf4b60480d64fa1de508 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBinding.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBinding.java
@@ -54,7 +54,7 @@ import javax.xml.ws.spi.WebServiceFeatureAnnotation;
  *
  * @see RespectBindingFeature
  *
- * @since JAX-WS 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBindingFeature.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBindingFeature.java
index 51320734bc4dc78093f58ab656416363aa23fd7e..5bf7bdd7ec0ecf9659126effc6caa85b85766693 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBindingFeature.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBindingFeature.java
@@ -80,7 +80,7 @@ import javax.xml.ws.soap.AddressingFeature;
  *
  * @see AddressingFeature
  *
- * @since JAX-WS 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 public final class RespectBindingFeature extends WebServiceFeature {
     /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Response.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/Response.java
index 8d5451f3be2c4975f6a13740f435da025a2ea8ee..e98ae8b20a08fd60b0832d38be178659bc59f8fd 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/Response.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/Response.java
@@ -39,7 +39,7 @@ import java.util.concurrent.Future;
  *  {@link WebServiceException} that represents the error that occured during the
  *  asynchronous method invocation.</p>
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface Response<T> extends Future<T> {
     /** Gets the contained response context.
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/ResponseWrapper.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/ResponseWrapper.java
index 3d7bb75051bc2c55d4fe32568d66f524251a219e..0bb891a9c66cf3fcdb7ce40ddec215367a636dc4 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/ResponseWrapper.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/ResponseWrapper.java
@@ -39,7 +39,7 @@ import java.lang.annotation.RetentionPolicy;
  * overloading conflicts in document literal mode. Only the <code>className</code>
  * is required in this case.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 
 @Target(ElementType.METHOD)
@@ -65,7 +65,7 @@ public @interface ResponseWrapper {
     /**
      * wsdl:part name for the wrapper part
      *
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public String partName() default "";
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/Service.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/Service.java
index 77b77e23c630f4b8f1d44d47921aee128df9e29f..a31df76c9df2489739aa282778d2d7af14976373 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/Service.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/Service.java
@@ -57,7 +57,7 @@ import javax.xml.ws.spi.Provider;
  * can be enabled by creating a <code>ThreadPoolExecutor</code> and
  * registering it with the service.
  *
- * @since JAX-WS 2.0
+ * @since 1.6, JAX-WS 2.0
  *
  * @see javax.xml.ws.spi.Provider
  * @see javax.xml.ws.handler.HandlerResolver
@@ -153,7 +153,7 @@ public class Service {
      * @see java.lang.reflect.InvocationHandler
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public <T> T getPort(QName portName,
             Class<T> serviceEndpointInterface, WebServiceFeature... features) {
@@ -219,7 +219,7 @@ public class Service {
      *
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public <T> T getPort(Class<T> serviceEndpointInterface,
             WebServiceFeature... features) {
@@ -297,7 +297,7 @@ public class Service {
      *                      with this port or is unsupported.
      *                  </UL>
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public <T> T getPort(EndpointReference endpointReference,
            Class<T> serviceEndpointInterface, WebServiceFeature... features) {
@@ -381,7 +381,7 @@ public class Service {
      * @see javax.xml.soap.SOAPMessage
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public <T> Dispatch<T> createDispatch(QName portName, Class<T> type,
             Service.Mode mode, WebServiceFeature... features) {
@@ -456,7 +456,7 @@ public class Service {
      * @see javax.xml.soap.SOAPMessage
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public <T> Dispatch<T> createDispatch(EndpointReference endpointReference,
             Class<T> type, Service.Mode mode,
@@ -514,7 +514,7 @@ public class Service {
      * @see javax.xml.bind.JAXBContext
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public Dispatch<Object> createDispatch(QName portName,
             JAXBContext context, Service.Mode mode, WebServiceFeature... features) {
@@ -587,7 +587,7 @@ public class Service {
      * @see javax.xml.bind.JAXBContext
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
     **/
     public Dispatch<Object> createDispatch(EndpointReference endpointReference,
             JAXBContext context, Service.Mode mode,
@@ -722,7 +722,7 @@ public class Service {
      *        it must throw a WebServiceException.
      * @throws WebServiceException If any error in creation of the
      *                    specified service.
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      **/
     public static Service create(
             java.net.URL wsdlDocumentLocation,
@@ -752,7 +752,7 @@ public class Service {
      * @throws WebServiceException If any error in creation of the
      *                    specified service
      *
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public static Service create(QName serviceName, WebServiceFeature ... features) {
         return new Service(null, serviceName, features);
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/ServiceMode.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/ServiceMode.java
index a451cd5fbaee2f31eff86af3825c65ffb4dd645e..84624794734c8b5f1ebe1dbbae130abae29873b1 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/ServiceMode.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/ServiceMode.java
@@ -36,7 +36,7 @@ import java.lang.annotation.Inherited;
  * Used to indicate whether a {@link Provider} implementation wishes to work
  * with entire protocol messages or just with protocol message payloads.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebEndpoint.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebEndpoint.java
index ebff61a1abc2bcd5fa0e86089afc61aa596557c4..3654ef202d068ef5caa43c10953225d72c7f88e8 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebEndpoint.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebEndpoint.java
@@ -41,7 +41,7 @@ import java.lang.annotation.RetentionPolicy;
  *  determined based on the value of the <code>WebServiceClient</code>
  *  annotation on the generated service interface itself.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
  *
  *  @see javax.xml.ws.WebServiceClient
 **/
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebFault.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebFault.java
index 7135c26f96b07c236fcd6d7a986a2f13bb373710..f3abbee035869979a61acd9e94013beaf0dcecf6 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebFault.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebFault.java
@@ -36,7 +36,7 @@ import java.lang.annotation.RetentionPolicy;
  * to the local and namespace name of the fault element and the name
  * of the fault bean.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
@@ -60,7 +60,7 @@ public @interface WebFault {
 
   /**
    *  wsdl:Message's name. Default name is the exception's class name.
-   *  @since JAX-WS 2.2
+   *  @since 1.7, JAX-WS 2.2
    */
   public String messageName() default "";
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceClient.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceClient.java
index d1e84128915d43ae08aaa0b889b35803ba38bf53..0d40a1fb47d9564b38baef8c50c74e2d7a85c0b0 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceClient.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceClient.java
@@ -40,7 +40,7 @@ import java.lang.annotation.RetentionPolicy;
  *  element represents the Web service for which the generated
  *  service interface provides a client view.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceContext.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceContext.java
index 618592ddbef87fb8012f35982bfb847cca90fb64..8ba63ab75a4125a86c165c1fe4bf029e5f089d6f 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceContext.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceContext.java
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
  *  into an endpoint implementation class using the
  *  <code>Resource</code> annotation.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
  *
  *  @see javax.annotation.Resource
  **/
@@ -120,7 +120,7 @@ public interface WebServiceContext {
      *
      * @see W3CEndpointReference
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      */
     public EndpointReference getEndpointReference(Element... referenceParameters);
 
@@ -144,7 +144,7 @@ public interface WebServiceContext {
      * @throws WebServiceException If the <code>clazz</code> type of
      * <code>EndpointReference</code> is not supported.
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public <T extends EndpointReference> T getEndpointReference(Class<T> clazz,
             Element... referenceParameters);
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceException.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceException.java
index aaf116bf1432fa898fb1f29abbd65ade9d246176..acd122b3a919c690ca2db75b08e82c9bf557678e 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceException.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceException.java
@@ -28,7 +28,7 @@ package javax.xml.ws;
 /** The <code>WebServiceException</code> class is the base
  *  exception class for all JAX-WS API runtime exceptions.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 
 public class WebServiceException extends java.lang.RuntimeException {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceFeature.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceFeature.java
index a08f95dbbff2c151a5a4ca86b5c73b1a0ce42f0a..ea60d367ff5e00dd1891adae0ee64db4095edd70 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceFeature.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceFeature.java
@@ -44,7 +44,7 @@ package javax.xml.ws;
  * @see javax.xml.ws.soap.AddressingFeature
  * @see javax.xml.ws.soap.MTOMFeature
  *
- * @since 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 public abstract class WebServiceFeature {
    /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServicePermission.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServicePermission.java
index d0ecad9aa21b917906c67606b6b0a20b39aebdcd..743243f22f6f36a4939907961dcc4af7be494266 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServicePermission.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServicePermission.java
@@ -55,6 +55,7 @@ import java.security.BasicPermission;
  * @see java.security.Permissions
  * @see java.lang.SecurityManager
  * @see java.net.SocketPermission
+ * @since 1.6
  */
 public final class WebServicePermission extends BasicPermission {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceProvider.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceProvider.java
index 4dfcaad959037ad0f72801f6282f276d672ee8b9..c2d48d2f5b9209804a0b4021ffe2135c6c172815 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceProvider.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceProvider.java
@@ -33,7 +33,7 @@ import java.lang.annotation.RetentionPolicy;
 /**
  * Used to annotate a Provider implementation class.
  *
- * @since JAX-WS 2.0
+ * @since 1.6, JAX-WS 2.0
  * @see javax.xml.ws.Provider
  */
 @Target(ElementType.TYPE)
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRef.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRef.java
index fe01112906c18f9da893d1f50153cd3f9d94030a..4d5c70e0a64b700756d28f327ae4858db16cf900 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRef.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRef.java
@@ -75,7 +75,7 @@ import java.lang.annotation.RetentionPolicy;
  * @see javax.annotation.Resource
  * @see WebServiceFeatureAnnotation
  *
- * @since JAX-WS 2.0
+ * @since 1.6, JAX-WS 2.0
  *
 **/
 
@@ -143,7 +143,7 @@ public @interface WebServiceRef {
      * A portable JNDI lookup name that resolves to the target
      * web service reference.
      *
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     String lookup() default "";
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRefs.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRefs.java
index c77749bb51064d2d2171a2892ec3dab583a801b6..10104f35d3e278551ad030be370a6fdc268a633d 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRefs.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRefs.java
@@ -69,7 +69,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * </code></pre>
  *
  * @see WebServiceRef
- * @since 2.0
+ * @since 1.6, JAX-WS 2.0
  */
 
 @Documented
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/Handler.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/Handler.java
index ec2781140127bc8dbf4d134cedae7e2af1f03382..dfd972b705ce88decf8d024753b0dfd6a0d91586 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/Handler.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/Handler.java
@@ -31,7 +31,7 @@ import javax.xml.ws.handler.MessageContext;
 /** The <code>Handler</code> interface
  *  is the base interface for JAX-WS handlers.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface Handler<C extends MessageContext> {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/HandlerResolver.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/HandlerResolver.java
index 3c3e04f8ce6eec47820c4f369977fce31e850e59..c0f2f97361bd0b1d4a626957f728d2aae7e43080 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/HandlerResolver.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/HandlerResolver.java
@@ -39,7 +39,7 @@ package javax.xml.ws.handler;
  *
  *  @see javax.xml.ws.Service#setHandlerResolver
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface HandlerResolver {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalHandler.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalHandler.java
index cc95233c938e377edb071aa81a30a74bd2725de8..c5e9589d24b69cee3efc147ab77a98b6542a90f9 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalHandler.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalHandler.java
@@ -28,7 +28,7 @@ package javax.xml.ws.handler;
 /** The <code>LogicalHandler</code> extends
  *  Handler to provide typesafety for the message context parameter.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface LogicalHandler<C extends LogicalMessageContext> extends Handler<C> {
 }
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalMessageContext.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalMessageContext.java
index 24c09dae3a57199915965ee8f6b63431c0b25342..0ae213ba063b3b07f02b94292472baecfebf250b 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalMessageContext.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalMessageContext.java
@@ -32,7 +32,7 @@ import javax.xml.ws.LogicalMessage;
  *  provide access to a the contained message as a protocol neutral
  *  LogicalMessage
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface LogicalMessageContext
                     extends MessageContext {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/MessageContext.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/MessageContext.java
index a893c7496510c7ddd3dec32db0512575015ecf97..35525fc0440338ff49a5254b5a9a6da2d39d5de8 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/MessageContext.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/MessageContext.java
@@ -36,7 +36,7 @@ import java.util.Map;
  * enable handlers in a handler chain to share processing related
  * state.
  *
- * @since JAX-WS 2.0
+ * @since 1.6, JAX-WS 2.0
  */
 public interface MessageContext extends Map<String, Object> {
 
@@ -168,7 +168,7 @@ public interface MessageContext extends Map<String, Object> {
      * wsa:IsReferenceParameter="true" attribute.
      * <p>Type: List&lt;Element>
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      */
     public static final String REFERENCE_PARAMETERS =
             "javax.xml.ws.reference.parameters";
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/PortInfo.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/PortInfo.java
index ee91456abdf3790283296d616f79d90374ac5b77..5f1b2c2dad90e53c78de8a866dfff5b0a66ad5c3 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/PortInfo.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/PortInfo.java
@@ -35,7 +35,7 @@ import javax.xml.namespace.QName;
  *  This interface is never implemented by an application,
  *  only by a JAX-WS implementation.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface PortInfo {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPHandler.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPHandler.java
index ba9232726c27f9eadc799a55544c34166735eea5..98a43cd181af4e515d8d6f6fce76342bfee4ceb7 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPHandler.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPHandler.java
@@ -33,7 +33,7 @@ import java.util.Set;
  *  to provide typesafety for the message context parameter and add a method
  *  to obtain access to the headers that may be processed by the handler.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface SOAPHandler<T extends SOAPMessageContext>
     extends Handler<T> {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPMessageContext.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPMessageContext.java
index 2df709f7721969e86220e6c2894dd4c5445eb75e..cf75e7d13fa687c8ff0621b578af57e971a6c8d3 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPMessageContext.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPMessageContext.java
@@ -38,7 +38,7 @@ import java.util.Set;
  *
  *  @see javax.xml.soap.SOAPMessage
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface SOAPMessageContext
                     extends javax.xml.ws.handler.MessageContext {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPBinding.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPBinding.java
index 8d4e0d0de336d3e60212472837e6346fe1aec83d..233a0a702f4b5b222ec3244244e2991b4257ade3 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPBinding.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPBinding.java
@@ -31,7 +31,7 @@ import javax.xml.ws.Binding;
 /** The <code>HTTPBinding</code> interface is an
  *  abstraction for the XML/HTTP binding.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface HTTPBinding extends Binding {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPException.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPException.java
index 4796394eb39d5dd21047df5b0858007ee857de45..592e302f0548b0f667157df65f00916c00bff22b 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPException.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPException.java
@@ -32,7 +32,7 @@ package javax.xml.ws.http;
  *  <p>Since there is no standard format for faults or exceptions
  *  in XML/HTTP messaging, only the HTTP status code is captured.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public class HTTPException extends javax.xml.ws.ProtocolException  {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/Addressing.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/Addressing.java
index 163d0f538b11e9e97e5fc3b3af5ac35ed9b1da38..5dbb42d26da6421dd3acb761523b350d0b66d32e 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/Addressing.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/Addressing.java
@@ -57,7 +57,7 @@ import javax.xml.ws.spi.WebServiceFeatureAnnotation;
  * This annotation's behaviour is defined by the corresponding feature
  * {@link AddressingFeature}.
  *
- * @since JAX-WS 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
@@ -106,7 +106,7 @@ public @interface Addressing {
      * <a href="http://www.w3.org/TR/ws-addr-metadata/#wspolicynonanonresponses">
      * 3.1.3 NonAnonymousResponses Assertion</a> in the generated WSDL.
      *
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     Responses responses() default Responses.ALL;
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/AddressingFeature.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/AddressingFeature.java
index dfd95c739f0dc5807685deace29f87e3ca6b2b93..8f9d730d797ce20839d9d12d8453a32caf7d06ee 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/AddressingFeature.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/AddressingFeature.java
@@ -112,7 +112,7 @@ import javax.xml.ws.Service;
  * for more information on WS-Addressing.
  *
  * @see Addressing
- * @since JAX-WS 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 
 public final class AddressingFeature extends WebServiceFeature {
@@ -151,7 +151,7 @@ public final class AddressingFeature extends WebServiceFeature {
      * <a href="http://www.w3.org/TR/ws-addr-metadata/#wspolicynonanonresponses">
      * 3.1.3 NonAnonymousResponses Assertion</a> in the generated WSDL.
      *
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public enum Responses {
         /**
@@ -229,7 +229,7 @@ public final class AddressingFeature extends WebServiceFeature {
      * @param required true means requires the use of ws-addressing .
      * @param responses specifies what type of responses are required
      *
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public AddressingFeature(boolean enabled, boolean required, Responses responses) {
         this.enabled = enabled;
@@ -268,7 +268,7 @@ public final class AddressingFeature extends WebServiceFeature {
      *         {@link Responses#NON_ANONYMOUS} when endpoint requires the use
      * of only non-anonymous responses
      *
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public Responses getResponses() {
         return responses;
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOM.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOM.java
index 995727497dd092bc704dd6653e4e2874b037e451..da6714e9a7ed8af75644befd9dc6b16242bba0cb 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOM.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOM.java
@@ -54,7 +54,7 @@ import javax.xml.ws.WebServiceProvider;
  * This annotation's behaviour is defined by the corresponding feature
  * {@link MTOMFeature}.
  *
- * @since JAX-WS 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOMFeature.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOMFeature.java
index a9581070088a0a939dbe8774cca97f421cda9e1e..232f98f91c252e6dd01ae5f3de9813b58278a64f 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOMFeature.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOMFeature.java
@@ -54,7 +54,7 @@ import javax.xml.ws.Service;
  * The {@link #threshold} property can be used to set the threshold
  * value used to determine when binary data should be XOP encoded.
  *
- * @since JAX-WS 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 public final class MTOMFeature extends WebServiceFeature {
     /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPBinding.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPBinding.java
index 104de2c1e35a604926c1d833aa87019e0a07b06b..4b9d88887f49cc8d202ff9158fa5d1295f8f5f67 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPBinding.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPBinding.java
@@ -34,7 +34,7 @@ import javax.xml.soap.MessageFactory;
 /** The <code>SOAPBinding</code> interface is an abstraction for
  *  the SOAP binding.
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
 **/
 public interface SOAPBinding extends Binding {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPFaultException.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPFaultException.java
index 0ac01421bc64d33caafa4fffd70a6ee55e807c84..575f840801c8a80fe968bc5d634dba4bb2c31729 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPFaultException.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPFaultException.java
@@ -48,7 +48,7 @@ import javax.xml.soap.SOAPFault;
  *  @see javax.xml.ws.soap.SOAPBinding#getSOAPFactory
  *  @see javax.xml.ws.ProtocolException
  *
- *  @since JAX-WS 2.0
+ *  @since 1.6, JAX-WS 2.0
  **/
 public class SOAPFaultException extends javax.xml.ws.ProtocolException  {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Invoker.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Invoker.java
index b581fba19199555377a4207a5a6dbd9faac0ff94..de719cabf53ce9b9a3b639d856e192d9c092d0af 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Invoker.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Invoker.java
@@ -43,7 +43,7 @@ import java.lang.reflect.InvocationTargetException;
  *
  * @see Provider#createEndpoint(String, Class, Invoker, WebServiceFeature...)
  * @author Jitendra Kotamraju
- * @since JAX-WS 2.2
+ * @since 1.7, JAX-WS 2.2
  */
 
 public abstract class Invoker {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Provider.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Provider.java
index f881048ed202ed3e0928b1dc302d4eb4825300b4..8c8b802130f4805bf8adcab6530036476f273741 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Provider.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Provider.java
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
  * <code>Endpoint</code> objects.
  * <p>
  *
- * @since JAX-WS 2.0
+ * @since 1.6, JAX-WS 2.0
  */
 public abstract class Provider {
 
@@ -161,7 +161,7 @@ public abstract class Provider {
      *        it must throw a WebServiceException.
      * @return The newly created service delegate.
      *
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public ServiceDelegate createServiceDelegate(
             java.net.URL wsdlDocumentLocation,
@@ -218,7 +218,7 @@ public abstract class Provider {
      * @throws NullPointerException If the <code>null</code>
      * <code>eprInfoset</code> value is given.
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public abstract EndpointReference readEndpointReference(javax.xml.transform.Source eprInfoset);
 
@@ -271,7 +271,7 @@ public abstract class Provider {
      *
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public abstract <T> T getPort(EndpointReference endpointReference,
             Class<T> serviceEndpointInterface,
@@ -333,7 +333,7 @@ public abstract class Provider {
      * @throws WebServiceException If an error occurs while creating the
      *                             <code>W3CEndpointReference</code>.
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      */
     public abstract W3CEndpointReference createW3CEndpointReference(String address, QName serviceName, QName portName,
             List<Element> metadata, String wsdlDocumentLocation, List<Element> referenceParameters);
@@ -407,7 +407,7 @@ public abstract class Provider {
      *     </ul>
      * @throws WebServiceException If an error occurs while creating the
      *                             <code>W3CEndpointReference</code>.
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public W3CEndpointReference createW3CEndpointReference(String address,
             QName interfaceName, QName serviceName, QName portName,
@@ -434,7 +434,7 @@ public abstract class Provider {
      *        endpoint.  Supported features not in the <code>features
      *        </code> parameter will have their default values.
      * @return The newly created endpoint.
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public Endpoint createAndPublishEndpoint(String address,
             Object implementor, WebServiceFeature ... features) {
@@ -455,7 +455,7 @@ public abstract class Provider {
      *        endpoint.  Supported features not in the <code>features
      *        </code> parameter will have their default values.
      * @return The newly created endpoint.
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public Endpoint createEndpoint(String bindingId, Object implementor,
             WebServiceFeature ... features) {
@@ -478,7 +478,7 @@ public abstract class Provider {
      *        endpoint.  Supported features not in the <code>features
      *        </code> parameter will have their default values.
      * @return The newly created endpoint.
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public Endpoint createEndpoint(String bindingId, Class<?> implementorClass,
             Invoker invoker, WebServiceFeature ... features) {
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/ServiceDelegate.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/ServiceDelegate.java
index dd181754e3673c8b0bd939a12302cfa07f8b7fe4..1c47536cf3ae7e8fca0602e37ed7f5a172534bb4 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/ServiceDelegate.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/ServiceDelegate.java
@@ -47,7 +47,7 @@ import javax.xml.ws.WebServiceException;
  * @see javax.xml.ws.Service
  * @see javax.xml.ws.spi.Provider
  *
- * @since JAX-WS 2.0
+ * @since 1.6, JAX-WS 2.0
  */
 public abstract class ServiceDelegate {
 
@@ -119,7 +119,7 @@ public abstract class ServiceDelegate {
      * @see java.lang.reflect.InvocationHandler
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public abstract <T> T getPort(QName portName,
             Class<T> serviceEndpointInterface, WebServiceFeature... features);
@@ -194,7 +194,7 @@ public abstract class ServiceDelegate {
      *                      with this port or is unsupported.
      *                  </UL>
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public abstract <T> T getPort(EndpointReference endpointReference,
            Class<T> serviceEndpointInterface, WebServiceFeature... features);
@@ -256,7 +256,7 @@ public abstract class ServiceDelegate {
      *
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public abstract <T> T getPort(Class<T> serviceEndpointInterface,
             WebServiceFeature... features);
@@ -334,7 +334,7 @@ public abstract class ServiceDelegate {
      * @see javax.xml.soap.SOAPMessage
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public abstract <T> Dispatch<T> createDispatch(QName portName, Class<T> type,
             Service.Mode mode, WebServiceFeature... features);
@@ -406,7 +406,7 @@ public abstract class ServiceDelegate {
      * @see javax.xml.soap.SOAPMessage
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public abstract <T> Dispatch<T> createDispatch(EndpointReference endpointReference,
             Class<T> type, Service.Mode mode,
@@ -462,7 +462,7 @@ public abstract class ServiceDelegate {
      * @see javax.xml.bind.JAXBContext
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
      **/
     public abstract Dispatch<Object> createDispatch(QName portName,
             JAXBContext context, Service.Mode mode, WebServiceFeature... features);
@@ -532,7 +532,7 @@ public abstract class ServiceDelegate {
      * @see javax.xml.bind.JAXBContext
      * @see WebServiceFeature
      *
-     * @since JAX-WS 2.1
+     * @since 1.6, JAX-WS 2.1
     **/
     public abstract Dispatch<Object> createDispatch(EndpointReference endpointReference,
             JAXBContext context, Service.Mode mode,
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java
index c99a4e88260a220b03ab5fc47816ce2a1dc10b39..39c0f25e3c4b945a54d0029e14e9d7ab9db86a7f 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java
@@ -65,7 +65,7 @@ import javax.xml.ws.soap.MTOM;
  * @see MTOM
  * @see RespectBinding
  *
- * @since JAX-WS 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 @Target(ElementType.ANNOTATION_TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpContext.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpContext.java
index aca0e3fb4871380adb825ab82be7672ee9dd519f..f62458455ac52f5ea3b80e4f7c97b66d598238fb 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpContext.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpContext.java
@@ -37,7 +37,7 @@ import java.util.Set;
  * web service requests to corresponding HttpContext objects.
  *
  * @author Jitendra Kotamraju
- * @since JAX-WS 2.2
+ * @since 1.7, JAX-WS 2.2
  */
 public abstract class HttpContext {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpExchange.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpExchange.java
index 233a48d084dec05548542e2265ad8adc05abb1fd..7b275ffb176d40f861da4baa8e7e61dab5b1145a 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpExchange.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpExchange.java
@@ -46,7 +46,7 @@ import java.security.Principal;
  * is undefined.
  *
  * @author Jitendra Kotamraju
- * @since JAX-WS 2.2
+ * @since 1.7, JAX-WS 2.2
  */
 public abstract class HttpExchange {
 
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpHandler.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpHandler.java
index 8d11ea35c8324498e61f2f46e2261c6b33c93aa9..cafc48ee47e303ab9203a4e37298522fa08f4601 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpHandler.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpHandler.java
@@ -36,7 +36,7 @@ import java.io.IOException;
  * {@link Endpoint#publish(HttpContext) }
  *
  * @author Jitendra Kotamraju
- * @since JAX-WS 2.2
+ * @since 1.7, JAX-WS 2.2
  */
 public abstract class HttpHandler {
     /**
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/package-info.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/package-info.java
index 87f37c76bb909f54b58150167198236ebfbdeccc..d105948e7f4134af69df3b3d2a3e855723d4f1ce 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/package-info.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/package-info.java
@@ -90,6 +90,6 @@
   </pre>
 
   @author Jitendra Kotamraju
-  @since JAX-WS 2.2
+  @since 1.7, JAX-WS 2.2
  */
 package javax.xml.ws.spi.http;
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java
index a1bc3e2b9c242fce0b244b3bfeea230f5ae53729..3d58a30159d9fd4a33dd12f7c08a66da48dfba28 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java
@@ -61,7 +61,7 @@ import java.util.Map;
  * WS-Addressing</a>
  * for more information on WS-Addressing EndpointReferences.
  *
- * @since JAX-WS 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 
 // XmlRootElement allows this class to be marshalled on its own
diff --git a/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java b/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
index 5538a1e0261ad58178de7f90cc93ccc25cf48494..fb33746531a862f84bf0f404a2caa33f24e97c3d 100644
--- a/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
+++ b/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
@@ -62,7 +62,7 @@ import javax.xml.ws.spi.Provider;
  * <code>endpointName</code> (if specified) MUST match a service and port
  * in the WSDL document.
  *
- * @since JAX-WS 2.1
+ * @since 1.6, JAX-WS 2.1
  */
 public final class W3CEndpointReferenceBuilder {
     /**
@@ -110,6 +110,7 @@ public final class W3CEndpointReferenceBuilder {
      * @return A <code>W3CEndpointReferenceBuilder</code> instance with
      *   the <code>interfaceName</code> as <code>wsam:InterfaceName</code>
      *   element added to the <code>wsa:Metadata</code> element
+     * @since 1.7
      */
     public W3CEndpointReferenceBuilder interfaceName(QName interfaceName) {
         this.interfaceName = interfaceName;
@@ -253,7 +254,7 @@ public final class W3CEndpointReferenceBuilder {
      * @throws java.lang.IllegalArgumentException if <code>element</code>
      * is <code>null</code>.
      *
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public W3CEndpointReferenceBuilder element(Element element) {
         if (element == null) {
@@ -277,7 +278,7 @@ public final class W3CEndpointReferenceBuilder {
      * @throws java.lang.IllegalArgumentException if <code>name</code>
      *   or <code>value</code> is <code>null</code>.
      *
-     * @since JAX-WS 2.2
+     * @since 1.7, JAX-WS 2.2
      */
     public W3CEndpointReferenceBuilder attribute(QName name, String value) {
         if (name == null || value == null) {