diff --git a/xml/src/main/java/org/springframework/xml/transform/StaxResult.java b/xml/src/main/java/org/springframework/xml/transform/StaxResult.java
index 0b91eff1..bc9140a1 100644
--- a/xml/src/main/java/org/springframework/xml/transform/StaxResult.java
+++ b/xml/src/main/java/org/springframework/xml/transform/StaxResult.java
@@ -21,17 +21,18 @@ import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.sax.SAXResult;
 
+import org.xml.sax.ContentHandler;
+
 import org.springframework.xml.stream.StaxEventContentHandler;
 import org.springframework.xml.stream.StaxStreamContentHandler;
-import org.xml.sax.ContentHandler;
 
 /**
  * Implementation of the <code>Result</code> tagging interface for StAX writers. Can be constructed with a
  * <code>XMLEventConsumer</code> or a <code>XMLStreamWriter</code>.
  * <p/>
  * This class is necessary because there is no implementation of <code>Source</code> for StaxReaders in JAXP 1.3. There
- * will be a <code>StaxResult</code> in JAXP 1.4 (JDK 1.6), and by the time that version is available, this class will
- * probably be deprecated.
+ * is a <code>StAXResult</code> in JAXP 1.4 (JDK 1.6), but this class is kept around for back-ward compatibility
+ * reasons.
  * <p/>
  * Even though <code>StaxResult</code> extends from <code>SAXResult</code>, calling the methods of
  * <code>SAXResult</code> is <strong>not supported</strong>. In general, the only supported operation on this class is
diff --git a/xml/src/main/java/org/springframework/xml/transform/StaxSource.java b/xml/src/main/java/org/springframework/xml/transform/StaxSource.java
index 2c33f2ba..00c76d65 100644
--- a/xml/src/main/java/org/springframework/xml/transform/StaxSource.java
+++ b/xml/src/main/java/org/springframework/xml/transform/StaxSource.java
@@ -20,18 +20,19 @@ import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.sax.SAXSource;
 
-import org.springframework.xml.stream.StaxEventXmlReader;
-import org.springframework.xml.stream.StaxStreamXmlReader;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
+import org.springframework.xml.stream.StaxEventXmlReader;
+import org.springframework.xml.stream.StaxStreamXmlReader;
+
 /**
  * Implementation of the <code>Source</code> tagging interface for StAX readers. Can be constructed with a
  * <code>XMLEventReader</code> or a <code>XMLStreamReader</code>.
  * <p/>
- * This class is necessary because there is no implementation of <code>Source</code> for StaxReaders in JAXP 1.3. There
- * will be a <code>StaxSource</code> in JAXP 1.4 (JDK 1.6), and by the time that version is available, this class will
- * probably be deprecated.
+ * This class is necessary because there is no implementation of <code>Source</code> for StAX Readers in JAXP 1.3. There
+ * is a <code>StAXSource</code> in JAXP 1.4 (JDK 1.6), but this class is kept around for back-ward compatibility
+ * reasons.
  * <p/>
  * Even though <code>StaxSource</code> extends from <code>SAXSource</code>, calling the methods of
  * <code>SAXSource</code> is <strong>not supported</strong>. In general, the only supported operation on this class is