diff --git a/oxm/src/main/java/org/springframework/oxm/AbstractMarshaller.java b/oxm/src/main/java/org/springframework/oxm/AbstractMarshaller.java
index b719a5c2..3fffc36b 100644
--- a/oxm/src/main/java/org/springframework/oxm/AbstractMarshaller.java
+++ b/oxm/src/main/java/org/springframework/oxm/AbstractMarshaller.java
@@ -56,6 +56,7 @@ import org.xml.sax.helpers.XMLReaderFactory;
  * methods.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/GenericMarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/GenericMarshallingFailureException.java
index 4e1985ec..5fab0a26 100644
--- a/oxm/src/main/java/org/springframework/oxm/GenericMarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/GenericMarshallingFailureException.java
@@ -15,26 +15,22 @@
  */
 package org.springframework.oxm;
 
-
 /**
  * Base class for exception thrown when a marshalling or unmarshalling error occurs.
- * 
+ *
  * @author Arjen Poutsma
  * @see MarshallingFailureException
  * @see UnmarshallingFailureException
+ * @since 1.0
  */
 public abstract class GenericMarshallingFailureException extends XmlMappingException {
 
-    /**
-     * Constructor for <code>GenericMarshallingFailureException</code>.
-     */
+    /** Constructor for <code>GenericMarshallingFailureException</code>. */
     public GenericMarshallingFailureException(String msg) {
         super(msg);
     }
 
-    /**
-     * Constructor for <code>GenericMarshallingFailureException</code>.
-     */
+    /** Constructor for <code>GenericMarshallingFailureException</code>. */
     public GenericMarshallingFailureException(String msg, Throwable ex) {
         super(msg, ex);
     }
diff --git a/oxm/src/main/java/org/springframework/oxm/Marshaller.java b/oxm/src/main/java/org/springframework/oxm/Marshaller.java
index 99bac694..5562bf96 100644
--- a/oxm/src/main/java/org/springframework/oxm/Marshaller.java
+++ b/oxm/src/main/java/org/springframework/oxm/Marshaller.java
@@ -27,6 +27,7 @@ import javax.xml.transform.Result;
  * class must be registered with the marshaller, or have a common base class.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public interface Marshaller {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
index 0fc2ace5..2b46fbda 100644
--- a/oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
@@ -15,13 +15,14 @@
  */
 package org.springframework.oxm;
 
-
 /**
  * Exception thrown on marshalling failure.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public class MarshallingFailureException extends GenericMarshallingFailureException {
+
     /**
      * Construct a <code>MarshallingFailureException</code> with the specified detail message.
      *
diff --git a/oxm/src/main/java/org/springframework/oxm/UncategorizedXmlMappingException.java b/oxm/src/main/java/org/springframework/oxm/UncategorizedXmlMappingException.java
index cea72338..9f994dcd 100644
--- a/oxm/src/main/java/org/springframework/oxm/UncategorizedXmlMappingException.java
+++ b/oxm/src/main/java/org/springframework/oxm/UncategorizedXmlMappingException.java
@@ -15,17 +15,15 @@
  */
 package org.springframework.oxm;
 
-
 /**
  * Superclass for exceptions that cannot be distinguished further.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public abstract class UncategorizedXmlMappingException extends XmlMappingException {
 
-    /**
-     * Constructor for <code>UncategorizedXmlMappingException</code>.
-     */
+    /** Constructor for <code>UncategorizedXmlMappingException</code>. */
     protected UncategorizedXmlMappingException(String msg, Throwable ex) {
         super(msg, ex);
     }
diff --git a/oxm/src/main/java/org/springframework/oxm/Unmarshaller.java b/oxm/src/main/java/org/springframework/oxm/Unmarshaller.java
index 951f8e09..114fc143 100644
--- a/oxm/src/main/java/org/springframework/oxm/Unmarshaller.java
+++ b/oxm/src/main/java/org/springframework/oxm/Unmarshaller.java
@@ -20,11 +20,11 @@ import javax.xml.transform.Source;
 
 /**
  * Defines the contract for Object XML Mapping unmarshallers.
- *
- * <p>Implementations of this interface can deserialize a given XML Stream to an
- * Object graph.
+ * <p/>
+ * <p>Implementations of this interface can deserialize a given XML Stream to an Object graph.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public interface Unmarshaller {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
index 8c98b0b0..bb2c4102 100644
--- a/oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
@@ -19,19 +19,16 @@ package org.springframework.oxm;
  * Exception thrown on unmarshalling failure.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public class UnmarshallingFailureException extends GenericMarshallingFailureException {
 
-    /**
-     * Constructor for <code>UnmarshallingFailureException</code>.
-     */
+    /** Constructor for <code>UnmarshallingFailureException</code>. */
     public UnmarshallingFailureException(String msg) {
         super(msg);
     }
 
-    /**
-     * Constructor for <code>UnmarshallingFailureException</code>.
-     */
+    /** Constructor for <code>UnmarshallingFailureException</code>. */
     public UnmarshallingFailureException(String msg, Throwable ex) {
         super(msg, ex);
     }
diff --git a/oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java b/oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
index 1d9f1533..969045d2 100644
--- a/oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
@@ -19,19 +19,16 @@ package org.springframework.oxm;
  * Exception thrown on marshalling validation failure.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public class ValidationFailureException extends XmlMappingException {
 
-    /**
-     * Constructor for <code>ValidationFailureException</code>.
-     */
+    /** Constructor for <code>ValidationFailureException</code>. */
     public ValidationFailureException(String msg) {
         super(msg);
     }
 
-    /**
-     * Constructor for <code>ValidationFailureException</code>.
-     */
+    /** Constructor for <code>ValidationFailureException</code>. */
     public ValidationFailureException(String msg, Throwable ex) {
         super(msg, ex);
     }
diff --git a/oxm/src/main/java/org/springframework/oxm/XmlMappingException.java b/oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
index 14cf87aa..8428e008 100644
--- a/oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
+++ b/oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
@@ -21,19 +21,16 @@ import org.springframework.xml.XmlException;
  * Root of the hierarchy of Object XML Mapping exceptions.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public abstract class XmlMappingException extends XmlException {
 
-    /**
-     * Constructor for <code>XmlMappingException</code>.
-     */
+    /** Constructor for <code>XmlMappingException</code>. */
     public XmlMappingException(String msg) {
         super(msg);
     }
 
-    /**
-     * Constructor for <code>XmlMappingException</code>.
-     */
+    /** Constructor for <code>XmlMappingException</code>. */
     public XmlMappingException(String msg, Throwable ex) {
         super(msg, ex);
     }
diff --git a/oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java b/oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
index c1cd4fcf..6961028a 100644
--- a/oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
+++ b/oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
@@ -73,6 +73,7 @@ import org.xml.sax.ext.LexicalHandler;
  * @see #setTargetClass(Class)
  * @see #setMappingLocation(org.springframework.core.io.Resource)
  * @see #setMappingLocations(org.springframework.core.io.Resource[])
+ * @since 1.0
  */
 public class CastorMarshaller extends AbstractMarshaller implements InitializingBean {
 
@@ -95,33 +96,27 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 
     private boolean ignoreExtraElements = false;
 
-    /**
-     * Returns whether the Castor  {@link Unmarshaller} should ignore attributes that do not match
-     * a specific field.
-     */
+    /** Returns whether the Castor  {@link Unmarshaller} should ignore attributes that do not match a specific field. */
     public boolean getIgnoreExtraAttributes() {
         return ignoreExtraAttributes;
     }
 
     /**
-     * Sets whether the Castor  {@link Unmarshaller} should ignore attributes that do not match
-     * a specific field. Default is <code>true</code>: extra attributes are ignored.
+     * Sets whether the Castor  {@link Unmarshaller} should ignore attributes that do not match a specific field.
+     * Default is <code>true</code>: extra attributes are ignored.
      */
     public void setIgnoreExtraAttributes(boolean ignoreExtraAttributes) {
         this.ignoreExtraAttributes = ignoreExtraAttributes;
     }
 
-    /**
-     * Returns whether the Castor  {@link Unmarshaller} should ignore elements that do not match
-     * a specific field.
-     */
+    /** Returns whether the Castor  {@link Unmarshaller} should ignore elements that do not match a specific field. */
     public boolean getIgnoreExtraElements() {
         return ignoreExtraElements;
     }
 
     /**
-     * Sets whether the Castor  {@link Unmarshaller} should ignore elements that do not match
-     * a specific field. Default is <code>false</code>, extra attributes are flagged as an error.
+     * Sets whether the Castor  {@link Unmarshaller} should ignore elements that do not match a specific field. Default
+     * is <code>false</code>, extra attributes are flagged as an error.
      */
     public void setIgnoreExtraElements(boolean ignoreExtraElements) {
         this.ignoreExtraElements = ignoreExtraElements;
@@ -346,10 +341,9 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
     /**
      * Template method that allows for customizing of the given Castor {@link Unmarshaller}.
      * <p/>
-     * Default implementation invokes {@link Unmarshaller#setValidation(boolean)},
-     * {@link Unmarshaller#setWhitespacePreserve(boolean)},
-     * {@link Unmarshaller#setIgnoreExtraAttributes(boolean)}, and {@link Unmarshaller#setIgnoreExtraElements(boolean)}
-     * with the properties set on this marshaller.
+     * Default implementation invokes {@link Unmarshaller#setValidation(boolean)}, {@link
+     * Unmarshaller#setWhitespacePreserve(boolean)}, {@link Unmarshaller#setIgnoreExtraAttributes(boolean)}, and {@link
+     * Unmarshaller#setIgnoreExtraElements(boolean)} with the properties set on this marshaller.
      */
     protected void customizeUnmarshaller(Unmarshaller unmarshaller) {
         unmarshaller.setValidation(isValidating());
diff --git a/oxm/src/main/java/org/springframework/oxm/castor/CastorMarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/castor/CastorMarshallingFailureException.java
index f5a08b58..a73b28fb 100644
--- a/oxm/src/main/java/org/springframework/oxm/castor/CastorMarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/castor/CastorMarshallingFailureException.java
@@ -16,7 +16,6 @@
 package org.springframework.oxm.castor;
 
 import org.exolab.castor.xml.MarshalException;
-
 import org.springframework.oxm.MarshallingFailureException;
 
 /**
@@ -24,6 +23,7 @@ import org.springframework.oxm.MarshallingFailureException;
  *
  * @author Arjen Poutsma
  * @see CastorUtils#convertXmlException
+ * @since 1.0
  */
 public class CastorMarshallingFailureException extends MarshallingFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/castor/CastorSystemException.java b/oxm/src/main/java/org/springframework/oxm/castor/CastorSystemException.java
index 0bc866e4..be282d97 100644
--- a/oxm/src/main/java/org/springframework/oxm/castor/CastorSystemException.java
+++ b/oxm/src/main/java/org/springframework/oxm/castor/CastorSystemException.java
@@ -20,8 +20,9 @@ import org.springframework.oxm.UncategorizedXmlMappingException;
 /**
  * Castor-specific subclass of <code>UncategorizedXmlMappingException</code>, for Castor exceptions that cannot be
  * distinguished further.
- * 
+ *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public class CastorSystemException extends UncategorizedXmlMappingException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/castor/CastorUnmarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/castor/CastorUnmarshallingFailureException.java
index 551389b1..e8f35649 100644
--- a/oxm/src/main/java/org/springframework/oxm/castor/CastorUnmarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/castor/CastorUnmarshallingFailureException.java
@@ -16,15 +16,15 @@
 package org.springframework.oxm.castor;
 
 import org.exolab.castor.xml.MarshalException;
-import org.xml.sax.SAXException;
-
 import org.springframework.oxm.UnmarshallingFailureException;
+import org.xml.sax.SAXException;
 
 /**
  * Castor-specific subclass of <code>UnmarshallingFailureException</code>.
  *
  * @author Arjen Poutsma
  * @see CastorUtils#convertXmlException
+ * @since 1.0
  */
 public class CastorUnmarshallingFailureException extends UnmarshallingFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/castor/CastorUtils.java b/oxm/src/main/java/org/springframework/oxm/castor/CastorUtils.java
index c45057b6..d8ae1131 100644
--- a/oxm/src/main/java/org/springframework/oxm/castor/CastorUtils.java
+++ b/oxm/src/main/java/org/springframework/oxm/castor/CastorUtils.java
@@ -18,13 +18,13 @@ package org.springframework.oxm.castor;
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.ValidationException;
 import org.exolab.castor.xml.XMLException;
-
 import org.springframework.oxm.XmlMappingException;
 
 /**
  * Generic utility methods for working with Castor. Mainly for internal use within the framework.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public class CastorUtils {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/castor/CastorValidationFailureException.java b/oxm/src/main/java/org/springframework/oxm/castor/CastorValidationFailureException.java
index 31de863f..ddced21a 100644
--- a/oxm/src/main/java/org/springframework/oxm/castor/CastorValidationFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/castor/CastorValidationFailureException.java
@@ -16,7 +16,6 @@
 package org.springframework.oxm.castor;
 
 import org.exolab.castor.xml.ValidationException;
-
 import org.springframework.oxm.ValidationFailureException;
 
 /**
@@ -24,6 +23,7 @@ import org.springframework.oxm.ValidationFailureException;
  *
  * @author Arjen Poutsma
  * @see CastorUtils#convertXmlException
+ * @since 1.0
  */
 public class CastorValidationFailureException extends ValidationFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/jaxb/AbstractJaxbMarshaller.java b/oxm/src/main/java/org/springframework/oxm/jaxb/AbstractJaxbMarshaller.java
index e9c8649a..b9f08097 100644
--- a/oxm/src/main/java/org/springframework/oxm/jaxb/AbstractJaxbMarshaller.java
+++ b/oxm/src/main/java/org/springframework/oxm/jaxb/AbstractJaxbMarshaller.java
@@ -39,6 +39,7 @@ import org.springframework.oxm.XmlMappingException;
  * @author Arjen Poutsma
  * @see Jaxb1Marshaller
  * @see Jaxb2Marshaller
+ * @since 1.0
  */
 public abstract class AbstractJaxbMarshaller
         implements org.springframework.oxm.Marshaller, org.springframework.oxm.Unmarshaller, InitializingBean {
diff --git a/oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb1Marshaller.java b/oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb1Marshaller.java
index 6e2be20b..b5777b65 100644
--- a/oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb1Marshaller.java
+++ b/oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb1Marshaller.java
@@ -36,6 +36,7 @@ import org.springframework.util.StringUtils;
  * @see #setMarshallerProperties(java.util.Map)
  * @see #setUnmarshallerProperties(java.util.Map)
  * @see #setValidating(boolean)
+ * @since 1.0
  */
 public class Jaxb1Marshaller extends AbstractJaxbMarshaller implements InitializingBean {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbMarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbMarshallingFailureException.java
index e5c71aa6..f07818df 100644
--- a/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbMarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbMarshallingFailureException.java
@@ -24,6 +24,7 @@ import org.springframework.oxm.MarshallingFailureException;
  *
  * @author Arjen Poutsma
  * @see JaxbUtils#convertJaxbException
+ * @since 1.0
  */
 public class JaxbMarshallingFailureException extends MarshallingFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbSystemException.java b/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbSystemException.java
index d7a2b85f..95d36b84 100644
--- a/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbSystemException.java
+++ b/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbSystemException.java
@@ -24,7 +24,8 @@ import org.springframework.oxm.UncategorizedXmlMappingException;
  * be distinguished further.
  *
  * @author Arjen Poutsma
- * @see JaxbUtils#convertJaxbException(javax.xml.bind.JAXBException) 
+ * @see JaxbUtils#convertJaxbException(javax.xml.bind.JAXBException)
+ * @since 1.0
  */
 public class JaxbSystemException extends UncategorizedXmlMappingException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbUnmarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbUnmarshallingFailureException.java
index 8b0c6a00..b5d69573 100644
--- a/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbUnmarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbUnmarshallingFailureException.java
@@ -24,6 +24,7 @@ import org.springframework.oxm.UnmarshallingFailureException;
  * JAXB-specific subclass of <code>UnmarshallingFailureException</code>.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public class JaxbUnmarshallingFailureException extends UnmarshallingFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbUtils.java b/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbUtils.java
index 9e269934..4b35d9b3 100644
--- a/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbUtils.java
+++ b/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbUtils.java
@@ -27,6 +27,7 @@ import org.springframework.util.ClassUtils;
  * Generic utility methods for working with JAXB. Mainly for internal use within the framework.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public abstract class JaxbUtils {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbValidationFailureException.java b/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbValidationFailureException.java
index 7c96d988..c2e50096 100644
--- a/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbValidationFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/jaxb/JaxbValidationFailureException.java
@@ -24,6 +24,7 @@ import org.springframework.oxm.ValidationFailureException;
  *
  * @author Arjen Poutsma
  * @see JaxbUtils#convertJaxbException
+ * @since 1.0
  */
 public class JaxbValidationFailureException extends ValidationFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java b/oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
index d13555d0..f36f68cd 100644
--- a/oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
+++ b/oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
@@ -71,6 +71,7 @@ import org.xml.sax.ext.LexicalHandler;
  * @author Arjen Poutsma
  * @see org.jibx.runtime.IMarshallingContext
  * @see org.jibx.runtime.IUnmarshallingContext
+ * @since 1.0
  */
 public class JibxMarshaller extends AbstractMarshaller implements InitializingBean {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshallingFailureException.java
index 4fbf894d..94521565 100644
--- a/oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshallingFailureException.java
@@ -17,14 +17,14 @@
 package org.springframework.oxm.jibx;
 
 import org.jibx.runtime.JiBXException;
-
 import org.springframework.oxm.MarshallingFailureException;
 
 /**
  * JiXB-specific subclass of <code>MarshallingFailureException</code>.
  *
  * @author Arjen Poutsma
- * @see JibxUtils#convertJibxException(org.jibx.runtime.JiBXException, boolean)
+ * @see JibxUtils#convertJibxException(org.jibx.runtime.JiBXException,boolean)
+ * @since 1.0
  */
 public class JibxMarshallingFailureException extends MarshallingFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/jibx/JibxSystemException.java b/oxm/src/main/java/org/springframework/oxm/jibx/JibxSystemException.java
index 0dabff7a..9256d876 100644
--- a/oxm/src/main/java/org/springframework/oxm/jibx/JibxSystemException.java
+++ b/oxm/src/main/java/org/springframework/oxm/jibx/JibxSystemException.java
@@ -23,7 +23,8 @@ import org.springframework.oxm.UncategorizedXmlMappingException;
  * be distinguished further.
  *
  * @author Arjen Poutsma
- * @see JibxUtils#convertJibxException(org.jibx.runtime.JiBXException, boolean)
+ * @see JibxUtils#convertJibxException(org.jibx.runtime.JiBXException,boolean)
+ * @since 1.0
  */
 public class JibxSystemException extends UncategorizedXmlMappingException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/jibx/JibxUnmarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/jibx/JibxUnmarshallingFailureException.java
index 539d487c..b24be0ca 100644
--- a/oxm/src/main/java/org/springframework/oxm/jibx/JibxUnmarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/jibx/JibxUnmarshallingFailureException.java
@@ -17,14 +17,14 @@
 package org.springframework.oxm.jibx;
 
 import org.jibx.runtime.JiBXException;
-
 import org.springframework.oxm.UnmarshallingFailureException;
 
 /**
  * JiXB-specific subclass of <code>UnmarshallingFailureException</code>.
  *
  * @author Arjen Poutsma
- * @see JibxUtils#convertJibxException(org.jibx.runtime.JiBXException, boolean)
+ * @see JibxUtils#convertJibxException(org.jibx.runtime.JiBXException,boolean)
+ * @since 1.0
  */
 public class JibxUnmarshallingFailureException extends UnmarshallingFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/jibx/JibxUtils.java b/oxm/src/main/java/org/springframework/oxm/jibx/JibxUtils.java
index 23bd4c6d..6dd63d92 100644
--- a/oxm/src/main/java/org/springframework/oxm/jibx/JibxUtils.java
+++ b/oxm/src/main/java/org/springframework/oxm/jibx/JibxUtils.java
@@ -18,13 +18,13 @@ package org.springframework.oxm.jibx;
 
 import org.jibx.runtime.JiBXException;
 import org.jibx.runtime.ValidationException;
-
 import org.springframework.oxm.XmlMappingException;
 
 /**
  * Generic utility methods for working with JiBX. Mainly for internal use within the framework.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public abstract class JibxUtils {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/jibx/JibxValidationFailureException.java b/oxm/src/main/java/org/springframework/oxm/jibx/JibxValidationFailureException.java
index 7fd0034e..deeac0b4 100644
--- a/oxm/src/main/java/org/springframework/oxm/jibx/JibxValidationFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/jibx/JibxValidationFailureException.java
@@ -17,14 +17,14 @@
 package org.springframework.oxm.jibx;
 
 import org.jibx.runtime.ValidationException;
-
 import org.springframework.oxm.ValidationFailureException;
 
 /**
  * JAXB-specific subclass of <code>ValidationFailureException</code>.
  *
  * @author Arjen Poutsma
- * @see JibxUtils#convertJibxException(org.jibx.runtime.JiBXException, boolean)
+ * @see JibxUtils#convertJibxException(org.jibx.runtime.JiBXException,boolean)
+ * @since 1.0
  */
 public class JibxValidationFailureException extends ValidationFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java b/oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
index 12c2cef8..372ec210 100644
--- a/oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
+++ b/oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
@@ -23,6 +23,7 @@ import javax.activation.DataHandler;
  *
  * @author Arjen Poutsma
  * @see <a href="http://www.w3.org/TR/2005/REC-xop10-20050125/">XML-binary Optimized Packaging</a>
+ * @since 1.0
  */
 public interface MimeContainer {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java b/oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java
index 71ee95c6..09d4676f 100644
--- a/oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java
+++ b/oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java
@@ -30,6 +30,7 @@ import org.springframework.oxm.XmlMappingException;
  * @see <a href="http://www.w3.org/TR/2004/WD-soap12-mtom-20040608/">SOAP Message Transmission Optimization
  *      Mechanism</a>
  * @see <a href="http://www.w3.org/TR/2005/REC-xop10-20050125/">XML-binary Optimized Packaging</a>
+ * @since 1.0
  */
 public interface MimeMarshaller extends Marshaller {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java b/oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java
index c19c4a9a..bdd83acf 100644
--- a/oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java
+++ b/oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java
@@ -30,6 +30,7 @@ import org.springframework.oxm.XmlMappingException;
  * @see <a href="http://www.w3.org/TR/2004/WD-soap12-mtom-20040608/">SOAP Message Transmission Optimization
  *      Mechanism</a>
  * @see <a href="http://www.w3.org/TR/2005/REC-xop10-20050125/">XML-binary Optimized Packaging</a>
+ * @since 1.0
  */
 public interface MimeUnmarshaller extends Unmarshaller {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java b/oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
index c8975547..d043eeaf 100644
--- a/oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
+++ b/oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
@@ -40,6 +40,7 @@ import org.xml.sax.SAXParseException;
  *
  * @author Arjen Poutsma
  * @see javax.xml.transform.Transformer
+ * @since 1.0
  */
 public class MarshallingSource extends SAXSource {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
index 77b23981..cc8511ec 100644
--- a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
+++ b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
@@ -38,12 +38,11 @@ import org.xml.sax.ext.LexicalHandler;
 
 /**
  * Implementation of the {@link Marshaller} interface for XMLBeans. Further options can be set by setting the
- * <code>xmlOptions</code> property. The {@link XmlOptionsFactoryBean} is provided to easily wire up
- * {@link XmlOptions} instances.
+ * <code>xmlOptions</code> property. The {@link XmlOptionsFactoryBean} is provided to easily wire up {@link XmlOptions}
+ * instances.
  * <p/>
- * Unmarshalled objects can be validated by setting the <code>validating</code> property, or by calling the
- * {@link #validate(XmlObject)} method directly. Invalid objects will result in an
- * {@link XmlBeansValidationFailureException}.
+ * Unmarshalled objects can be validated by setting the <code>validating</code> property, or by calling the {@link
+ * #validate(XmlObject)} method directly. Invalid objects will result in an {@link XmlBeansValidationFailureException}.
  * <p/>
  * <strong>Note</strong> that due to the nature of XMLBeans, this marshaller requires all passed objects to be of type
  * {@link XmlObject}.
@@ -52,6 +51,7 @@ import org.xml.sax.ext.LexicalHandler;
  * @see #setXmlOptions(org.apache.xmlbeans.XmlOptions)
  * @see XmlOptionsFactoryBean
  * @see #setValidating(boolean)
+ * @since 1.0
  */
 public class XmlBeansMarshaller extends AbstractMarshaller {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallingFailureException.java
index 836f8212..8e259072 100644
--- a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallingFailureException.java
@@ -16,15 +16,15 @@
 package org.springframework.oxm.xmlbeans;
 
 import org.apache.xmlbeans.XmlException;
-import org.xml.sax.SAXException;
-
 import org.springframework.oxm.MarshallingFailureException;
+import org.xml.sax.SAXException;
 
 /**
  * XMLBeans-specific subclass of <code>MarshallingFailureException</code>.
  *
  * @author Arjen Poutsma
- * @see XmlBeansUtils#convertXmlBeansException(Exception, boolean)
+ * @see XmlBeansUtils#convertXmlBeansException(Exception,boolean)
+ * @since 1.0
  */
 public class XmlBeansMarshallingFailureException extends MarshallingFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansSystemException.java b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansSystemException.java
index 2010edc8..823d24ab 100644
--- a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansSystemException.java
+++ b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansSystemException.java
@@ -18,10 +18,11 @@ package org.springframework.oxm.xmlbeans;
 import org.springframework.oxm.UncategorizedXmlMappingException;
 
 /**
- * XMLBeans-specific subclass of <code>UncategorizedXmlMappingException</code>, for XMLBeans exceptions that cannot
- * be distinguished further.
- * 
+ * XMLBeans-specific subclass of <code>UncategorizedXmlMappingException</code>, for XMLBeans exceptions that cannot be
+ * distinguished further.
+ *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public class XmlBeansSystemException extends UncategorizedXmlMappingException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallingFailureException.java
index 33fbd656..22f72e72 100644
--- a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallingFailureException.java
@@ -16,15 +16,15 @@
 package org.springframework.oxm.xmlbeans;
 
 import org.apache.xmlbeans.XmlException;
-import org.xml.sax.SAXException;
-
 import org.springframework.oxm.UnmarshallingFailureException;
+import org.xml.sax.SAXException;
 
 /**
  * XMLBeans-specific subclass of <code>UnmarshallingFailureException</code>.
  *
  * @author Arjen Poutsma
- * @see XmlBeansUtils#convertXmlBeansException(Exception, boolean)
+ * @see XmlBeansUtils#convertXmlBeansException(Exception,boolean)
+ * @since 1.0
  */
 public class XmlBeansUnmarshallingFailureException extends UnmarshallingFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansUtils.java b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansUtils.java
index 1644f010..3d665472 100644
--- a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansUtils.java
+++ b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansUtils.java
@@ -17,14 +17,14 @@ package org.springframework.oxm.xmlbeans;
 
 import org.apache.xmlbeans.XMLStreamValidationException;
 import org.apache.xmlbeans.XmlException;
-import org.xml.sax.SAXException;
-
 import org.springframework.oxm.XmlMappingException;
+import org.xml.sax.SAXException;
 
 /**
  * Generic utility methods for working with XMLBeans. Mainly for internal use within the framework.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public class XmlBeansUtils {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansValidationFailureException.java b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansValidationFailureException.java
index c7fff246..7a76480c 100644
--- a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansValidationFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansValidationFailureException.java
@@ -17,7 +17,6 @@ package org.springframework.oxm.xmlbeans;
 
 import org.apache.xmlbeans.XMLStreamValidationException;
 import org.apache.xmlbeans.XmlException;
-
 import org.springframework.oxm.ValidationFailureException;
 
 /**
@@ -25,6 +24,7 @@ import org.springframework.oxm.ValidationFailureException;
  *
  * @author Arjen Poutsma
  * @see org.springframework.oxm.xmlbeans.XmlBeansUtils#convertXmlBeansException
+ * @since 1.0
  */
 public class XmlBeansValidationFailureException extends ValidationFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
index 04897bae..73bc4051 100644
--- a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
+++ b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
@@ -20,7 +20,6 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.xmlbeans.XmlOptions;
-
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 
@@ -33,6 +32,7 @@ import org.springframework.beans.factory.InitializingBean;
  * @see XmlOptions
  * @see #setOptions(java.util.Map)
  * @see XmlBeansMarshaller#setXmlOptions(org.apache.xmlbeans.XmlOptions)
+ * @since 1.0
  */
 public class XmlOptionsFactoryBean implements FactoryBean, InitializingBean {
 
@@ -40,23 +40,17 @@ public class XmlOptionsFactoryBean implements FactoryBean, InitializingBean {
 
     private Map options;
 
-    /**
-     * Returns the singleton <code>XmlOptions</code>.
-     */
+    /** Returns the singleton <code>XmlOptions</code>. */
     public Object getObject() throws Exception {
         return xmlOptions;
     }
 
-    /**
-     * Returns the class of <code>XmlOptions</code>.
-     */
+    /** Returns the class of <code>XmlOptions</code>. */
     public Class getObjectType() {
         return XmlOptions.class;
     }
 
-    /**
-     * Returns <code>true</code>.
-     */
+    /** Returns <code>true</code>. */
     public boolean isSingleton() {
         return true;
     }
@@ -65,7 +59,7 @@ public class XmlOptionsFactoryBean implements FactoryBean, InitializingBean {
      * Sets options on the underlying <code>XmlOptions</code> object. The keys of the supplied map should be one of the
      * string constants defined in <code>XmlOptions</code>, the values vary per option.
      *
-     * @see XmlOptions#put(Object, Object)
+     * @see XmlOptions#put(Object,Object)
      * @see XmlOptions#SAVE_PRETTY_PRINT
      * @see XmlOptions#LOAD_STRIP_COMMENTS
      */
diff --git a/oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
index cb50f026..64ae0187 100644
--- a/oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
+++ b/oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
@@ -74,6 +74,7 @@ import org.xml.sax.ext.LexicalHandler;
  * @see #DEFAULT_ENCODING
  * @see #setAliases(Map)
  * @see #setConverters(ConverterMatcher[])
+ * @since 1.0
  */
 public class XStreamMarshaller extends AbstractMarshaller {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshallingFailureException.java
index 4410e369..a6dfabfa 100644
--- a/oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshallingFailureException.java
@@ -19,13 +19,13 @@ package org.springframework.oxm.xstream;
 import com.thoughtworks.xstream.alias.CannotResolveClassException;
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.io.StreamException;
-
 import org.springframework.oxm.MarshallingFailureException;
 
 /**
  * XStream-specific subclass of <code>MarshallingFailureException</code>.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public class XStreamMarshallingFailureException extends MarshallingFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/xstream/XStreamSystemException.java b/oxm/src/main/java/org/springframework/oxm/xstream/XStreamSystemException.java
index f1247f86..2b80eea8 100644
--- a/oxm/src/main/java/org/springframework/oxm/xstream/XStreamSystemException.java
+++ b/oxm/src/main/java/org/springframework/oxm/xstream/XStreamSystemException.java
@@ -23,6 +23,7 @@ import org.springframework.oxm.UncategorizedXmlMappingException;
  * distinguished further.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public class XStreamSystemException extends UncategorizedXmlMappingException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/xstream/XStreamUnmarshallingFailureException.java b/oxm/src/main/java/org/springframework/oxm/xstream/XStreamUnmarshallingFailureException.java
index 36a28030..3cfafc93 100644
--- a/oxm/src/main/java/org/springframework/oxm/xstream/XStreamUnmarshallingFailureException.java
+++ b/oxm/src/main/java/org/springframework/oxm/xstream/XStreamUnmarshallingFailureException.java
@@ -21,13 +21,13 @@ import javax.xml.stream.XMLStreamException;
 import com.thoughtworks.xstream.alias.CannotResolveClassException;
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.io.StreamException;
-
 import org.springframework.oxm.UnmarshallingFailureException;
 
 /**
  * XStream-specific subclass of <code>UnmarshallingFailureException</code>.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public class XStreamUnmarshallingFailureException extends UnmarshallingFailureException {
 
diff --git a/oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java b/oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java
index 5c1bda75..b5ad1d4f 100644
--- a/oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java
+++ b/oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java
@@ -19,13 +19,13 @@ package org.springframework.oxm.xstream;
 import com.thoughtworks.xstream.alias.CannotResolveClassException;
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.io.StreamException;
-
 import org.springframework.oxm.XmlMappingException;
 
 /**
  * Generic utility methods for working with XStream. Mainly for internal use within the framework.
  *
  * @author Arjen Poutsma
+ * @since 1.0
  */
 public abstract class XStreamUtils {