# HG changeset patch
# User lana
# Date 1404927691 25200
# Node ID d501c3d3dab3729397be62899dfa1b4dc1101d5a
# Parent  709d34294db71874a9cb0c48a32d51893f8a9fe9# Parent  52f78f8ed13bf7b9da08245c6ff07b14e2d10f7e
Merge

diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java
--- a/jaxp/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java	Wed Jul 09 10:41:31 2014 -0700
@@ -78,7 +78,6 @@
  * class file.  Those interested in programatically generating classes
  * should see the <a href="../generic/ClassGen.html">ClassGen</a> class.
 
- * @version $Id: JavaClass.java,v 1.4 2007-07-19 04:34:42 ofung Exp $
  * @see com.sun.org.apache.bcel.internal.generic.ClassGen
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java
--- a/jaxp/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java	Wed Jul 09 10:41:31 2014 -0700
@@ -82,7 +82,6 @@
  * method in the Method's frame will jump to the appropiate method in
  * the Code frame.
  *
- * @version $Id: Class2HTML.java,v 1.3 2007-07-19 04:34:52 ofung Exp $
  * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
 */
 public class Class2HTML implements Constants
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/bcel/internal/util/ClassPath.java
--- a/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassPath.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassPath.java	Wed Jul 09 10:41:31 2014 -0700
@@ -66,7 +66,6 @@
  * Responsible for loading (class) files from the CLASSPATH. Inspired by
  * sun.tools.ClassPath.
  *
- * @version $Id: ClassPath.java,v 1.4 2007-07-19 04:34:52 ofung Exp $
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  */
 public class ClassPath implements Serializable {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java
--- a/jaxp/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java	Wed Jul 09 10:41:31 2014 -0700
@@ -72,7 +72,6 @@
  * <pre>java com.sun.org.apache.bcel.internal.util.JavaWrapper -Dbcel.classloader=foo.MyLoader &lt;real.class.name&gt; [arguments]</pre>
  * </p>
  *
- * @version $Id: JavaWrapper.java,v 1.3 2007-07-19 04:34:52 ofung Exp $
  * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
  * @see ClassLoader
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java
--- a/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  *
  * @author Huizhe Wang, Oracle
  *
- * @version $Id: Constants.java,v 1.14 2011-06-07 04:39:40 joehw Exp $
  */
 public final class XalanConstants {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java
--- a/jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  * class and modified to be used as a general utility for creating objects
  * dynamically.
  *
- * @version $Id: ObjectFactory.java,v 1.11 2010-11-01 04:34:25 joehw Exp $
  */
 public class ObjectFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
--- a/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java	Wed Jul 09 10:41:31 2014 -0700
@@ -92,7 +92,6 @@
  * of thing but in a much simpler manner.</p>
  *
  * @author Shane_Curcuru@us.ibm.com
- * @version $Id: EnvironmentCheck.java,v 1.10 2010-11-01 04:34:13 joehw Exp $
  */
 public class EnvironmentCheck
 {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -109,7 +109,6 @@
  * @author Arnaud  Le Hors, IBM
  * @author Joe Kesselman, IBM
  * @author Andy Clark, IBM
- * @version $Id: AttrImpl.java,v 1.5 2008/06/10 00:59:32 joehw Exp $
  * @since PR-DOM-Level-1-19980818.
  *
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -37,7 +37,6 @@
  * @author Arnaud  Le Hors, IBM
  * @author Andy Clark, IBM
  * @author Ralf Pfeiffer, IBM
- * @version $Id: AttrNSImpl.java,v 1.7 2010-11-01 04:39:37 joehw Exp $
  */
 public class AttrNSImpl
     extends AttrImpl {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java	Wed Jul 09 10:41:31 2014 -0700
@@ -40,7 +40,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: AttributeMap.java,v 1.7 2010-11-01 04:39:37 joehw Exp $
  */
 public class AttributeMap extends NamedNodeMapImpl {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -52,7 +52,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: CoreDOMImplementationImpl.java,v 1.6 2010-11-01 04:39:37 joehw Exp $
  * @since PR-DOM-Level-1-19980818.
  */
 public class CoreDOMImplementationImpl
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -79,7 +79,6 @@
  * @author Joe Kesselman, IBM
  * @author Andy Clark, IBM
  * @author Ralf Pfeiffer, IBM
- * @version $Id: CoreDocumentImpl.java,v 1.9 2010-11-01 04:39:37 joehw Exp $
  * @since  PR-DOM-Level-1-19980818.
  */
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -68,7 +68,6 @@
  *
  * @author Elena Litani, IBM
  * @author Neeraj Bajaj, Sun Microsystems.
- * @version $Id: DOMConfigurationImpl.java,v 1.9 2010-11-01 04:39:37 joehw Exp $
  */
 public class DOMConfigurationImpl extends ParserConfigurationSettings
     implements XMLParserConfiguration, DOMConfiguration {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -31,7 +31,6 @@
  * @xerces.internal
  *
  * @author Sandy Gao, IBM
- * @version $Id: DOMMessageFormatter.java,v 1.6 2010-11-01 04:39:38 joehw Exp $
  */
 public class DOMMessageFormatter {
     public static final String DOM_DOMAIN = "http://www.w3.org/dom/DOMTR";
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java	Wed Jul 09 10:41:31 2014 -0700
@@ -94,7 +94,6 @@
  *
  * @author Elena Litani, IBM
  * @author Neeraj Bajaj, Sun Microsystems, inc.
- * @version $Id: DOMNormalizer.java,v 1.9 2010-11-01 04:39:38 joehw Exp $
  */
 public class DOMNormalizer implements XMLDocumentHandler {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -40,7 +40,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: DeferredDocumentImpl.java,v 1.11 2010-11-01 04:39:38 joehw Exp $
  * @since  PR-DOM-Level-1-19980818.
  */
 public class DeferredDocumentImpl
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -76,7 +76,6 @@
  * @author Joe Kesselman, IBM
  * @author Andy Clark, IBM
  * @author Ralf Pfeiffer, IBM
- * @version $Id: DocumentImpl.java,v 1.6 2010/07/20 20:25:24 joehw Exp $
  * @since  PR-DOM-Level-1-19980818.
  */
 public class DocumentImpl
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -42,7 +42,6 @@
  *
  * @author Elena litani, IBM
  * @author Neeraj Bajaj, Sun Microsystems
- * @version $Id: ElementNSImpl.java,v 1.7 2010-11-01 04:39:39 joehw Exp $
  */
 public class ElementNSImpl
     extends ElementImpl {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -56,7 +56,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: NamedNodeMapImpl.java,v 1.8 2010-11-01 04:39:39 joehw Exp $
  * @since  PR-DOM-Level-1-19980818.
  */
 public class NamedNodeMapImpl
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java	Wed Jul 09 10:41:31 2014 -0700
@@ -30,7 +30,6 @@
  *
  * @author Arnaud  Le Hors, IBM
  *
- * @version $Id: NodeListCache.java,v 1.6 2010/07/20 20:25:25 joehw Exp $
  */
 class NodeListCache implements Serializable {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: PSVIElementNSImpl.java,v 1.6 2010/08/20 18:51:54 joehw Exp $
  */
 public class PSVIElementNSImpl extends ElementNSImpl implements ElementPSVI {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java	Wed Jul 09 10:41:31 2014 -0700
@@ -68,7 +68,6 @@
  * @author Arnaud  Le Hors, IBM
  * @author Joe Kesselman, IBM
  * @author Andy Clark, IBM
- * @version $Id: ParentNode.java,v 1.6 2009/07/21 20:30:28 joehw Exp $
  */
 public abstract class ParentNode
     extends ChildNode {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java	Wed Jul 09 10:41:31 2014 -0700
@@ -31,7 +31,6 @@
  *
  * @author Andy Clark, IBM
  *
- * @version $Id: Constants.java,v 1.14 2010-11-01 04:39:40 joehw Exp $
  */
 public final class Constants {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/Version.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/Version.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/Version.java	Wed Jul 09 10:41:31 2014 -0700
@@ -64,7 +64,6 @@
 /**
  * This class defines the version number of the parser.
  *
- * @version $Id: Version.java,v 1.4 2010-11-01 04:39:40 joehw Exp $
  */
 public class Version {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -96,7 +96,6 @@
  * @author Arnaud  Le Hors, IBM
  * @author Eric Ye, IBM
  *
- * @version $Id: XML11DocumentScannerImpl.java,v 1.5 2010/08/04 20:59:09 joehw Exp $
  */
 public class XML11DocumentScannerImpl
     extends XMLDocumentScannerImpl {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java	Wed Jul 09 10:41:31 2014 -0700
@@ -77,7 +77,6 @@
  *
  * @author Michael Glavassevich, IBM
  * @author Neil Graham, IBM
- * @version $Id: XML11EntityScanner.java,v 1.5 2010-11-01 04:39:40 joehw Exp $
  */
 
 public class XML11EntityScanner
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -108,7 +108,6 @@
  * @author Elena Litani, IBM
  * @author Michael Glavassevich, IBM
  * @author Sunitha Reddy, Sun Microsystems
- * @version $Id: XML11NSDocumentScannerImpl.java,v 1.6 2010-11-01 04:39:40 joehw Exp $
  */
 public class XML11NSDocumentScannerImpl extends XML11DocumentScannerImpl {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -69,7 +69,6 @@
  * @author Glenn Marcy, IBM
  * @author Eric Ye, IBM
  *
- * @version $Id: XMLDTDScannerImpl.java,v 1.8 2010-11-01 04:39:41 joehw Exp $
  */
 public class XMLDTDScannerImpl
 extends XMLScanner
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -78,7 +78,6 @@
  * @author Arnaud  Le Hors, IBM
  * @author Eric Ye, IBM
  * @author Sunitha Reddy, SUN Microsystems
- * @version $Id: XMLDocumentFragmentScannerImpl.java,v 1.19 2010-11-02 19:54:55 joehw Exp $
  *
  */
 public class XMLDocumentFragmentScannerImpl
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -65,7 +65,6 @@
  * Refer to the table in unit-test javax.xml.stream.XMLStreamReaderTest.SupportDTD for changes
  * related to property SupportDTD.
  * @author Joe Wang, Sun Microsystems
- * @version $Id: XMLDocumentScannerImpl.java,v 1.17 2010-11-01 04:39:41 joehw Exp $
  */
 public class XMLDocumentScannerImpl
         extends XMLDocumentFragmentScannerImpl{
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java	Wed Jul 09 10:41:31 2014 -0700
@@ -83,7 +83,6 @@
  * @author K.Venugopal SUN Microsystems
  * @author Neeraj Bajaj SUN Microsystems
  * @author Sunitha Reddy SUN Microsystems
- * @version $Id: XMLEntityManager.java,v 1.17 2010-11-01 04:39:41 joehw Exp $
  */
 public class XMLEntityManager implements XMLComponent, XMLEntityResolver {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -111,7 +111,6 @@
  * @author Eric Ye, IBM
  * @author Andy Clark, IBM
  *
- * @version $Id: XMLErrorReporter.java,v 1.5 2010-11-01 04:39:41 joehw Exp $
  */
 public class XMLErrorReporter
     implements XMLComponent {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -58,7 +58,6 @@
  * @author Neeraj Bajaj, Sun Microsystems
  * @author Venugopal Rao K, Sun Microsystems
  * @author Elena Litani, IBM
- * @version $Id: XMLNSDocumentScannerImpl.java,v 1.11 2010-11-01 04:39:41 joehw Exp $
  */
 public class XMLNSDocumentScannerImpl
         extends XMLDocumentScannerImpl {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java	Wed Jul 09 10:41:31 2014 -0700
@@ -97,7 +97,6 @@
  *
  * @author Andy Clark, IBM
  *
- * @version $Id: XMLNamespaceBinder.java,v 1.4 2010-11-01 04:39:41 joehw Exp $
  */
 public class XMLNamespaceBinder
     implements XMLComponent, XMLDocumentFilter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Wed Jul 09 10:41:31 2014 -0700
@@ -69,7 +69,6 @@
  * @author Eric Ye, IBM
  * @author K.Venugopal SUN Microsystems
  * @author Sunitha Reddy, SUN Microsystems
- * @version $Id: XMLScanner.java,v 1.12 2010-11-01 04:39:41 joehw Exp $
  */
 public abstract class XMLScanner
         implements XMLComponent {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  * @xerces.internal
  *
  * @author Michael Glavassevich, IBM
- * @version $Id: BalancedDTDGrammar.java,v 1.1 2010/08/11 07:18:38 joehw Exp $
  */
 final class BalancedDTDGrammar extends DTDGrammar {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java	Wed Jul 09 10:41:31 2014 -0700
@@ -101,7 +101,6 @@
  * @author Andy Clark, IBM
  * @author Neil Graham, IBM
  *
- * @version $Id: DTDGrammar.java,v 1.4 2010/08/11 07:18:37 joehw Exp $
  */
 public class DTDGrammar
     implements XMLDTDHandler, XMLDTDContentModelHandler, EntityState, Grammar {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java	Wed Jul 09 10:41:31 2014 -0700
@@ -75,7 +75,6 @@
  * @xerces.internal
  *
  * @author Neil Graham, IBM
- * @version $Id: XMLDTDDescription.java,v 1.4 2010/08/11 07:18:38 joehw Exp $
  */
 public class XMLDTDDescription extends XMLResourceIdentifierImpl
         implements com.sun.org.apache.xerces.internal.xni.grammars.XMLDTDDescription {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java	Wed Jul 09 10:41:31 2014 -0700
@@ -108,7 +108,6 @@
  * @author Neil Graham, IBM
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: XMLDTDLoader.java,v 1.6 2010-11-01 04:39:42 joehw Exp $
  */
 public class XMLDTDLoader
         extends XMLDTDProcessor
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java	Wed Jul 09 10:41:31 2014 -0700
@@ -113,7 +113,6 @@
  *
  * @author Neil Graham, IBM
  *
- * @version $Id: XMLDTDProcessor.java,v 1.5 2010-11-01 04:39:42 joehw Exp $
  */
 public class XMLDTDProcessor
         implements XMLComponent, XMLDTDFilter, XMLDTDContentModelFilter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java	Wed Jul 09 10:41:31 2014 -0700
@@ -83,7 +83,6 @@
  * @author Jeffrey Rodriguez IBM
  * @author Neil Graham, IBM
  *
- * @version $Id: XMLDTDValidator.java,v 1.8 2010-11-01 04:39:42 joehw Exp $
  */
 public class XMLDTDValidator
         implements XMLComponent, XMLDocumentFilter, XMLDTDValidatorFilter, RevalidationHandler {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java	Wed Jul 09 10:41:31 2014 -0700
@@ -68,7 +68,6 @@
 
 /**
 
- * @version $Id: DFAContentModel.java,v 1.4 2010/08/06 23:49:43 joehw Exp $
  * DFAContentModel is the derivative of ContentModel that does
  * all of the non-trivial element content validation. This class does
  * the conversion from the regular expression to the DFA that
@@ -82,7 +81,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: DFAContentModel.java,v 1.4 2010/08/06 23:49:43 joehw Exp $
  */
 public class DFAContentModel
     implements ContentModelValidator {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: DTDDVFactory.java,v 1.6 2010-11-01 04:39:43 joehw Exp $
  */
 public abstract class DTDDVFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: DatatypeException.java,v 1.6 2010-11-01 04:39:43 joehw Exp $
  */
 public class DatatypeException extends Exception {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -40,7 +40,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: SchemaDVFactory.java,v 1.6 2010-11-01 04:39:43 joehw Exp $
  */
 public abstract class SchemaDVFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java	Wed Jul 09 10:41:31 2014 -0700
@@ -29,7 +29,6 @@
  * @xerces.internal
  *
  * @author Sandy Gao, IBM
- * @version $Id: ValidationContext.java,v 1.6 2010/07/23 02:09:29 joehw Exp $
  */
 public interface ValidationContext {
     // whether to validate against facets
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -31,7 +31,6 @@
  *
  * @author Ankit Pasricha, IBM
  *
- * @version $Id: ByteListImpl.java,v 1.7 2010-11-01 04:39:46 joehw Exp $
  */
 public class ByteListImpl extends AbstractList implements ByteList {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -47,7 +47,6 @@
  * @author Len Berman
  * @author Gopal Sharma, SUN Microsystems Inc.
  *
- * @version $Id: AbstractDateTimeDV.java,v 1.7 2010-11-01 04:39:46 joehw Exp $
  */
 public abstract class AbstractDateTimeDV extends TypeValidator {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -33,7 +33,6 @@
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: Base64BinaryDV.java,v 1.7 2010-11-01 04:39:46 joehw Exp $
  */
 public class Base64BinaryDV extends TypeValidator {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: BaseDVFactory.java,v 1.7 2010-11-01 04:39:46 joehw Exp $
  */
 public class BaseDVFactory extends SchemaDVFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -38,7 +38,6 @@
  * @author Sandy Gao, IBM
  * @author Khaled Noaman, IBM
  *
- * @version $Id: BaseSchemaDVFactory.java,v 1.2 2010-10-26 23:01:03 joehw Exp $
  */
 public abstract class BaseSchemaDVFactory extends SchemaDVFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  * @author Elena Litani
  * @author Gopal Sharma, SUN Microsystems Inc.
  *
- * @version $Id: DateDV.java,v 1.7 2010-11-01 04:39:46 joehw Exp $
  */
 public class DateDV extends DateTimeDV {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -36,7 +36,6 @@
  * @author Elena Litani
  * @author Gopal Sharma, SUN Microsystem Inc.
  *
- * @version $Id: DateTimeDV.java,v 1.7 2010-11-01 04:39:46 joehw Exp $
  */
 public class DateTimeDV extends AbstractDateTimeDV {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -33,7 +33,6 @@
  *
  * @author Elena Litani
  * @author Gopal Sharma, SUN Microsystem Inc.
- * @version $Id: DayDV.java,v 1.7 2010-11-01 04:39:46 joehw Exp $
  */
 public class DayDV extends AbstractDateTimeDV {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  *
  * @author Ankit Pasricha, IBM
  *
- * @version $Id: DayTimeDurationDV.java,v 1.6 2010-11-01 04:39:46 joehw Exp $
  */
 class DayTimeDurationDV extends DurationDV {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: DoubleDV.java,v 1.7 2010-11-01 04:39:46 joehw Exp $
  */
 public class DoubleDV extends TypeValidator {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -36,7 +36,6 @@
  *
  * @author Elena Litani
  * @author Gopal Sharma, SUN Microsystem Inc.
- * @version $Id: DurationDV.java,v 1.7 2010-11-01 04:39:47 joehw Exp $
  */
 public class DurationDV extends AbstractDateTimeDV {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  *
  * @author Khaled Noaman, IBM
  *
- * @version $Id: ExtendedSchemaDVFactoryImpl.java,v 1.2 2010-10-26 23:01:03 joehw Exp $
  */
 public class ExtendedSchemaDVFactoryImpl extends BaseSchemaDVFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: FloatDV.java,v 1.7 2010-11-01 04:39:47 joehw Exp $
  */
 public class FloatDV extends TypeValidator {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -33,7 +33,6 @@
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: HexBinaryDV.java,v 1.7 2010-11-01 04:39:47 joehw Exp $
  */
 public class HexBinaryDV extends TypeValidator {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: ListDV.java,v 1.7 2010-11-01 04:39:47 joehw Exp $
  */
 public class ListDV extends TypeValidator{
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  * @author Elena Litani
  * @author Gopal Sharma, SUN Microsystem Inc.
  *
- * @version $Id: MonthDV.java,v 1.8 2010-11-01 04:39:47 joehw Exp $
  */
 
 public class MonthDV extends AbstractDateTimeDV {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  * @author Elena Litani
  * @author Gopal Sharma, SUN Microsystem Inc.
  *
- * @version $Id: MonthDayDV.java,v 1.7 2010-11-01 04:39:47 joehw Exp $
  */
 
 public class MonthDayDV extends AbstractDateTimeDV {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: SchemaDVFactoryImpl.java,v 1.7 2010-11-01 04:39:47 joehw Exp $
  */
 public class SchemaDVFactoryImpl extends BaseSchemaDVFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  * @author Elena Litani
  * @author Gopal Sharma, SUN Microsystem Inc.
  *
- * @version $Id: TimeDV.java,v 1.7 2010-11-01 04:39:47 joehw Exp $
  */
 public class TimeDV extends AbstractDateTimeDV {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -60,7 +60,6 @@
  * @author Sandy Gao, IBM
  * @author Neeraj Bajaj, Sun Microsystems, inc.
  *
- * @version $Id: XSSimpleTypeDecl.java 3029 2011-04-24 17:50:18Z joehw $
  */
 public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java	Wed Jul 09 10:41:31 2014 -0700
@@ -39,7 +39,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: XSSimpleTypeDelegate.java,v 1.3 2010-11-01 04:39:47 joehw Exp $
  */
 public class XSSimpleTypeDelegate
     implements XSSimpleType {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  * @author Elena Litani
  * @author Gopal Sharma, SUN Microsystem Inc.
  *
- * @version $Id: YearDV.java,v 1.7 2010-11-01 04:39:47 joehw Exp $
  */
 
 public class YearDV extends AbstractDateTimeDV {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  * @author Elena Litani
  * @author Gopal Sharma, SUN Microsystem Inc.
  *
- * @version $Id: YearMonthDV.java,v 1.7 2010-11-01 04:39:47 joehw Exp $
  */
 public class YearMonthDV extends AbstractDateTimeDV{
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  *
  * @author Ankit Pasricha, IBM
  *
- * @version $Id: YearMonthDurationDV.java,v 1.6 2010-11-01 04:39:47 joehw Exp $
  */
 class YearMonthDurationDV extends DurationDV {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -33,7 +33,6 @@
  * @xerces.internal
  *
  * @author Eric Ye, IBM
- * @version $Id: XMLMessageFormatter.java 3094 2012-03-21 05:50:01Z joehw $
  *
  */
 public class XMLMessageFormatter implements MessageFormatter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Eric Ye, IBM
- * @version $Id: XMLMessageFormatter_de.java 3094 2012-03-21 05:50:01Z joehw $
  *
  */
 public class XMLMessageFormatter_de implements MessageFormatter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Eric Ye, IBM
- * @version $Id: XMLMessageFormatter_es.java 3094 2012-03-21 05:50:01Z joehw $
  *
  */
 public class XMLMessageFormatter_es implements MessageFormatter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Eric Ye, IBM
- * @version $Id: XMLMessageFormatter_fr.java 3094 2012-03-21 05:50:01Z joehw $
  *
  */
 public class XMLMessageFormatter_fr implements MessageFormatter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Eric Ye, IBM
- * @version $Id: XMLMessageFormatter_it.java 3094 2012-03-21 05:50:01Z joehw $
  *
  */
 public class XMLMessageFormatter_it implements MessageFormatter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Eric Ye, IBM
- * @version $Id: XMLMessageFormatter_ja.java 3094 2012-03-21 05:50:01Z joehw $
  *
  */
 public class XMLMessageFormatter_ja implements MessageFormatter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Eric Ye, IBM
- * @version $Id: XMLMessageFormatter_ko.java 3094 2012-03-21 05:50:01Z joehw $
  *
  */
 public class XMLMessageFormatter_ko implements MessageFormatter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Eric Ye, IBM
- * @version $Id: XMLMessageFormatter_pt_BR.java 3094 2012-03-21 05:50:01Z joehw $
  *
  */
 public class XMLMessageFormatter_pt_BR implements MessageFormatter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Eric Ye, IBM
- * @version $Id: XMLMessageFormatter_sv.java 3094 2012-03-21 05:50:01Z joehw $
  *
  */
 public class XMLMessageFormatter_sv implements MessageFormatter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Eric Ye, IBM
- * @version $Id: XMLMessageFormatter_zh_CN.java 3094 2012-03-21 05:50:01Z joehw $
  *
  */
 public class XMLMessageFormatter_zh_CN implements MessageFormatter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Eric Ye, IBM
- * @version $Id: XMLMessageFormatter_zh_TW.java 3094 2012-03-21 05:50:01Z joehw $
  *
  */
 public class XMLMessageFormatter_zh_TW implements MessageFormatter {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  * @xerces.internal
  *
  * @author Elena Litani, IBM
- * @version $Id: ValidationState.java,v 1.7 2010-11-01 04:39:53 joehw Exp $
  */
 public class ValidationState implements ValidationContext {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java	Wed Jul 09 10:41:31 2014 -0700
@@ -22,7 +22,6 @@
 package com.sun.org.apache.xerces.internal.impl.xpath.regex;
 
 /**
- * @version $Id: CaseInsensitiveMap.java,v 1.1 2010/07/27 06:29:27 joehw Exp $
  */
 
 public class CaseInsensitiveMap {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java	Wed Jul 09 10:41:31 2014 -0700
@@ -29,7 +29,6 @@
  * @xerces.internal
  *
  * @author TAMURA Kent &lt;kent@trl.ibm.co.jp&gt;
- * @version $Id: ParserForXMLSchema.java,v 1.9 2010-11-12 18:09:45 joehw Exp $
  */
 class ParserForXMLSchema extends RegexParser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -31,7 +31,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: RegexParser.java,v 1.8 2010-11-01 04:39:54 joehw Exp $
  */
 class RegexParser {
     static final int T_CHAR = 0;
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java	Wed Jul 09 10:41:31 2014 -0700
@@ -486,7 +486,6 @@
  * @xerces.internal
  *
  * @author TAMURA Kent &lt;kent@trl.ibm.co.jp&gt;
- * @version $Id: RegularExpression.java,v 1.9 2010/07/27 05:02:34 joehw Exp $
  */
 public class RegularExpression implements java.io.Serializable {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java	Wed Jul 09 10:41:31 2014 -0700
@@ -28,7 +28,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: Token.java,v 1.7 2010/07/27 05:02:34 joehw Exp $
  */
 class Token implements java.io.Serializable {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java	Wed Jul 09 10:41:31 2014 -0700
@@ -75,7 +75,6 @@
  * @author Sandy Gao, IBM
  * @author Elena Litani, IBM
  *
- * @version $Id: SchemaGrammar.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 
 public class SchemaGrammar implements XSGrammar, XSNamespaceItem {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: SubstitutionGroupHandler.java,v 1.6 2010-11-01 04:39:55 joehw Exp $
  */
 public class SubstitutionGroupHandler {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java	Wed Jul 09 10:41:31 2014 -0700
@@ -98,7 +98,6 @@
  * @xerces.internal
  *
  * @author Neil Graham, IBM
- * @version $Id: XMLSchemaLoader.java,v 1.10 2010-11-01 04:39:55 joehw Exp $
  */
 
 public class XMLSchemaLoader implements XMLGrammarLoader, XMLComponent,
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java	Wed Jul 09 10:41:31 2014 -0700
@@ -107,7 +107,6 @@
  * @author Elena Litani IBM
  * @author Andy Clark IBM
  * @author Neeraj Bajaj, Sun Microsystems, inc.
- * @version $Id: XMLSchemaValidator.java,v 1.16 2010-11-01 04:39:55 joehw Exp $
  */
 public class XMLSchemaValidator
     implements XMLComponent, XMLDocumentFilter, FieldActivator, RevalidationHandler {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -41,7 +41,6 @@
  *
  * @author Elena Litani, IBM
  * @author Sandy Gao, IBM
- * @version $Id: XSAttributeDecl.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSAttributeDecl implements XSAttributeDeclaration {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -39,7 +39,6 @@
  * @author Sandy Gao, IBM
  * @author Rahul Srivastava, Sun Microsystems Inc.
  *
- * @version $Id: XSAttributeGroupDecl.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSAttributeGroupDecl implements XSAttributeGroupDefinition {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -36,7 +36,6 @@
  * @xerces.internal
  *
  * @author Sandy Gao, IBM
- * @version $Id: XSAttributeUseImpl.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSAttributeUseImpl implements XSAttributeUse {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -36,7 +36,6 @@
  *
  * @author Elena Litani, IBM
  * @author Sandy Gao, IBM
- * @version $Id: XSComplexTypeDecl.java,v 1.8 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSComplexTypeDecl implements XSComplexTypeDefinition, TypeInfo {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java	Wed Jul 09 10:41:31 2014 -0700
@@ -45,7 +45,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: XSConstraints.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSConstraints {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  * @author Neil Graham, IBM
  * @author Neeraj Bajaj, SUN Microsystems.
  *
- * @version $Id: XSDDescription.java,v 1.6 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSDDescription extends XMLResourceIdentifierImpl
                 implements XMLSchemaDescription {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java	Wed Jul 09 10:41:31 2014 -0700
@@ -33,7 +33,6 @@
  * @xerces.internal
  *
  * @author Elena Litani, IBM
- * @version $Id: XSDeclarationPool.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public final class XSDeclarationPool {
     /** Chunk shift (8). */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -43,7 +43,6 @@
  *
  * @author Elena Litani, IBM
  * @author Sandy Gao, IBM
- * @version $Id: XSElementDecl.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSElementDecl implements XSElementDeclaration {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java	Wed Jul 09 10:41:31 2014 -0700
@@ -31,7 +31,6 @@
  * @xerces.internal
  *
  * @author Sandy Gao, IBM
- * @version $Id: XSGrammarBucket.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSGrammarBucket {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -36,7 +36,6 @@
  * @xerces.internal
  *
  * @author Sandy Gao, IBM
- * @version $Id: XSGroupDecl.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSGroupDecl implements XSModelGroupDefinition {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -45,7 +45,6 @@
  *
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: XSLoaderImpl.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public final class XSLoaderImpl implements XSLoader, DOMConfiguration {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  * @xerces.internal
  *
  * @author Elena Litani, IBM
- * @version $Id: XSMessageFormatter.java,v 1.6 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSMessageFormatter implements MessageFormatter {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: XSModelGroupImpl.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSModelGroupImpl implements XSModelGroup {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -57,7 +57,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: XSModelImpl.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public final class XSModelImpl extends AbstractList implements XSModel, XSNamespaceItemList {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  * @xerces.internal
  *
  * @author Rahul Srivastava, Sun Microsystems Inc.
- * @version $Id: XSNotationDecl.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSNotationDecl implements XSNotationDeclaration {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: XSParticleDecl.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSParticleDecl implements XSParticle {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -38,7 +38,6 @@
  * @author Sandy Gao, IBM
  * @author Rahul Srivastava, Sun Microsystems Inc.
  *
- * @version $Id: XSWildcardDecl.java,v 1.7 2010-11-01 04:39:55 joehw Exp $
  */
 public class XSWildcardDecl implements XSWildcard {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Andy Clark, IBM
- * @version $Id: Field.java,v 1.6 2010-11-01 04:39:57 joehw Exp $
  */
 public class Field {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Andy Clark, IBM
- * @version $Id: Selector.java,v 1.7 2010-11-01 04:39:57 joehw Exp $
  */
 public class Selector {
 
@@ -106,7 +105,6 @@
      * Schema identity constraint selector XPath expression.
      *
      * @author Andy Clark, IBM
-     * @version $Id: Selector.java,v 1.7 2010-11-01 04:39:57 joehw Exp $
      */
     public static class XPath
     extends com.sun.org.apache.xerces.internal.impl.xpath.XPath {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java	Wed Jul 09 10:41:31 2014 -0700
@@ -36,7 +36,6 @@
  * @author Elena Litani, IBM
  * @author Sandy Gao, IBM
  *
- * @version $Id: CMBuilder.java,v 1.11 2010/08/06 23:49:43 joehw Exp $
  */
 public class CMBuilder {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  *
  * @author  Neeraj Bajaj
  *
- * @version $Id: CMNodeFactory.java,v 1.7 2010-11-01 04:39:58 joehw Exp $
  */
 public class CMNodeFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Pavani Mukthipudi, Sun Microsystems Inc.
- * @version $Id: XSAllCM.java,v 1.10 2010-11-01 04:39:58 joehw Exp $
  */
 public class XSAllCM implements XSCMValidator {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java	Wed Jul 09 10:41:31 2014 -0700
@@ -27,7 +27,6 @@
  * @xerces.internal
  *
  * @author Michael Glavassevich, IBM
- * @version $Id: XSCMRepeatingLeaf.java,v 1.1 2010/08/06 23:49:43 joehw Exp $
  */
 public final class XSCMRepeatingLeaf extends XSCMLeaf {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  *
  * @author Sandy Gao, IBM
  * @author Elena Litani, IBM
- * @version $Id: XSCMValidator.java,v 1.6 2009/07/28 15:18:12 spericas Exp $
  */
 public interface XSCMValidator {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java	Wed Jul 09 10:41:31 2014 -0700
@@ -45,7 +45,6 @@
  * @xerces.internal
  *
  * @author Neil Graham, IBM
- * @version $Id: XSDFACM.java,v 1.9 2010/08/06 23:49:43 joehw Exp $
  */
 public class XSDFACM
     implements XSCMValidator {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java	Wed Jul 09 10:41:31 2014 -0700
@@ -37,7 +37,6 @@
  *
  * @author Elena Litani, Lisa Martin
  * @author IBM
- * @version $Id: XSEmptyCM.java,v 1.7 2009/07/28 15:18:11 spericas Exp $
  */
 public class XSEmptyCM  implements XSCMValidator {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -73,7 +73,6 @@
  *
  * @author Rahul Srivastava, Sun Microsystems Inc.
  *
- * @version $Id: AttrImpl.java,v 1.5 2010-11-01 04:40:01 joehw Exp $
  */
 public class AttrImpl extends NodeImpl
                       implements Attr {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -31,7 +31,6 @@
  * @author Rahul Srivastava, Sun Microsystems Inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: ElementImpl.java,v 1.7 2010-11-01 04:40:01 joehw Exp $
  */
 public class ElementImpl extends DefaultElement {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java	Wed Jul 09 10:41:31 2014 -0700
@@ -40,7 +40,6 @@
  * @author Rahul Srivastava, Sun Microsystems Inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: SchemaDOM.java,v 1.7 2010-11-01 04:40:01 joehw Exp $
  */
 public class SchemaDOM extends DefaultDocument {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java	Wed Jul 09 10:41:31 2014 -0700
@@ -28,7 +28,6 @@
 /**
  * @xerces.internal
  *
- * @version $Id: SchemaDOMImplementation.java,v 1.2 2010-10-26 23:01:18 joehw Exp $
  */
 final class SchemaDOMImplementation implements DOMImplementation {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -46,7 +46,6 @@
  * @author Rahul Srivastava, Sun Microsystems Inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: SchemaDOMParser.java,v 1.8 2010-11-01 04:40:01 joehw Exp $
  */
 public class SchemaDOMParser extends DefaultXMLDocumentHandler {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java	Wed Jul 09 10:41:31 2014 -0700
@@ -57,7 +57,6 @@
  *
  * @author Rahul Srivastava, Sun Microsystems Inc.
  *
- * @version $Id: SchemaParsingConfig.java,v 1.8 2010-11-01 04:40:01 joehw Exp $
  */
 public class SchemaParsingConfig extends BasicParserConfiguration
     implements XMLPullParserConfiguration {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -54,7 +54,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: StAXSchemaParser.java,v 1.2 2010-10-26 23:01:12 joehw Exp $
  */
 final class StAXSchemaParser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java	Wed Jul 09 10:41:31 2014 -0700
@@ -69,7 +69,6 @@
  * @xerces.internal
  *
  * @author Sandy Gao, IBM
- * @version $Id: XSAttributeChecker.java,v 1.12 2010-11-01 04:40:02 joehw Exp $
  */
 
 public class XSAttributeChecker {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -36,7 +36,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: XSDAbstractIDConstraintTraverser.java,v 1.7 2010-11-01 04:40:02 joehw Exp $
  */
 class XSDAbstractIDConstraintTraverser extends XSDAbstractTraverser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -37,7 +37,6 @@
  *
  * @author Elena Litani, IBM
  * @author Sandy Gao, IBM
- * @version $Id: XSDAbstractParticleTraverser.java,v 1.7 2010-11-01 04:40:02 joehw Exp $
  */
 abstract class XSDAbstractParticleTraverser extends XSDAbstractTraverser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -58,7 +58,6 @@
  * @author Rahul Srivastava, Sun Microsystems Inc.
  * @author Neeraj Bajaj, Sun Microsystems Inc.
  *
- * @version $Id: XSDAbstractTraverser.java,v 1.8 2010-11-01 04:40:02 joehw Exp $
  */
 abstract class XSDAbstractTraverser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -46,7 +46,6 @@
  * @author Rahul Srivastava, Sun Microsystems Inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: XSDAttributeGroupTraverser.java,v 1.7 2010-11-01 04:40:02 joehw Exp $
  */
 class XSDAttributeGroupTraverser extends XSDAbstractTraverser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -59,7 +59,6 @@
  *
  * @author Sandy Gao, IBM
  * @author Neeraj Bajaj, Sun Microsystems, inc.
- * @version $Id: XSDAttributeTraverser.java,v 1.7 2010-11-01 04:40:02 joehw Exp $
  */
 class XSDAttributeTraverser extends XSDAbstractTraverser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -62,7 +62,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: XSDComplexTypeTraverser.java,v 1.8 2010-11-01 04:40:02 joehw Exp $
  */
 
 class  XSDComplexTypeTraverser extends XSDAbstractParticleTraverser {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -69,7 +69,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: XSDElementTraverser.java,v 1.9 2010-11-01 04:40:02 joehw Exp $
  */
 class XSDElementTraverser extends XSDAbstractTraverser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -47,7 +47,6 @@
  * @author Rahul Srivastava, Sun Microsystems Inc.
  * @author Elena Litani, IBM
  * @author Lisa Martin,  IBM
- * @version $Id: XSDGroupTraverser.java,v 1.7 2010-11-01 04:40:02 joehw Exp $
  */
 class  XSDGroupTraverser extends XSDAbstractParticleTraverser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -131,7 +131,6 @@
  * @author Neil Graham, IBM
  * @author Pavani Mukthipudi, Sun Microsystems
  *
- * @version $Id: XSDHandler.java,v 1.9 2010-11-01 04:40:02 joehw Exp $
  */
 public class XSDHandler {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Neil Graham, IBM
- * @version $Id: XSDKeyrefTraverser.java,v 1.7 2010-11-01 04:40:02 joehw Exp $
  */
 class XSDKeyrefTraverser extends XSDAbstractIDConstraintTraverser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -45,7 +45,6 @@
  *
  * @author Rahul Srivastava, Sun Microsystems Inc.
  * @author Elena Litani, IBM
- * @version $Id: XSDNotationTraverser.java,v 1.7 2010-11-01 04:40:02 joehw Exp $
  */
 class  XSDNotationTraverser extends XSDAbstractTraverser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -78,7 +78,6 @@
  * @author Neeraj Bajaj, Sun Microsystems, Inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: XSDSimpleTypeTraverser.java,v 1.7 2010-11-01 04:40:02 joehw Exp $
  */
 class XSDSimpleTypeTraverser extends XSDAbstractTraverser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,7 +35,6 @@
  * @xerces.internal
  *
  * @author Neil Graham, IBM
- * @version $Id: XSDUniqueOrKeyTraverser.java,v 1.7 2010-11-01 04:40:02 joehw Exp $
  */
 class XSDUniqueOrKeyTraverser extends XSDAbstractIDConstraintTraverser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -57,7 +57,6 @@
  * @author Rahul Srivastava, Sun Microsystems Inc.
  * @author Sandy Gao, IBM
  *
- * @version $Id: XSDWildcardTraverser.java,v 1.7 2010-11-01 04:40:02 joehw Exp $
  */
 class XSDWildcardTraverser extends XSDAbstractTraverser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java	Wed Jul 09 10:41:31 2014 -0700
@@ -43,7 +43,6 @@
  * @xerces.internal
  *
  * @author Neil Graham, IBM
- * @version $Id: XSDocumentInfo.java,v 1.5 2007/10/15 22:27:48 spericas Exp $
  */
 class XSDocumentInfo {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  *
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: LSInputListImpl.java,v 1.2 2010-10-26 23:01:04 joehw Exp $
  */
 public final class LSInputListImpl extends AbstractList implements LSInputList {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -31,7 +31,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: ObjectListImpl.java,v 1.2 2010-10-26 23:01:04 joehw Exp $
  */
 public final class ObjectListImpl extends AbstractList implements ObjectList {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: ShortListImpl.java,v 1.7 2010-11-01 04:40:06 joehw Exp $
  */
 public final class ShortListImpl extends AbstractList implements ShortList {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -33,7 +33,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: StringListImpl.java,v 1.7 2010-11-01 04:40:06 joehw Exp $
  */
 public final class StringListImpl extends AbstractList implements StringList {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java	Wed Jul 09 10:41:31 2014 -0700
@@ -36,7 +36,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: XSGrammarPool.java,v 1.7 2010-11-01 04:40:06 joehw Exp $
  */
 public class XSGrammarPool extends XMLGrammarPoolImpl {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java	Wed Jul 09 10:41:31 2014 -0700
@@ -29,7 +29,6 @@
 /**
  * @xerces.internal
  *
- * @version $Id: XSInputSource.java,v 1.2 2010-10-26 23:01:05 joehw Exp $
  */
 public final class XSInputSource extends XMLInputSource {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: XSNamedMap4Types.java,v 1.7 2010-11-01 04:40:06 joehw Exp $
  */
 public final class XSNamedMap4Types extends XSNamedMapImpl {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -41,7 +41,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: XSNamedMapImpl.java,v 1.7 2010-11-01 04:40:06 joehw Exp $
  */
 public class XSNamedMapImpl extends AbstractMap implements XSNamedMap {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -36,7 +36,6 @@
  *
  * @author Sandy Gao, IBM
  *
- * @version $Id: XSObjectListImpl.java,v 1.7 2010-11-01 04:40:06 joehw Exp $
  */
 public class XSObjectListImpl extends AbstractList implements XSObjectList {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -37,7 +37,6 @@
 /**
  * @author Rajiv Mordani
  * @author Edwin Goei
- * @version $Id: DocumentBuilderFactoryImpl.java,v 1.8 2010-11-01 04:40:06 joehw Exp $
  */
 public class DocumentBuilderFactoryImpl extends DocumentBuilderFactory {
     /** These are DocumentBuilderFactory attributes not DOM attributes */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -58,7 +58,6 @@
 /**
  * @author Rajiv Mordani
  * @author Edwin Goei
- * @version $Id: DocumentBuilderImpl.java,v 1.8 2010-11-01 04:40:06 joehw Exp $
  */
 public class DocumentBuilderImpl extends DocumentBuilder
         implements JAXPConstants
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -43,7 +43,6 @@
  * @author Rajiv Mordani
  * @author Edwin Goei
  *
- * @version $Id: SAXParserFactoryImpl.java,v 1.9 2010-11-01 04:40:06 joehw Exp $
  */
 public class SAXParserFactoryImpl extends SAXParserFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -63,7 +63,6 @@
  * @author Rajiv Mordani
  * @author Edwin Goei
  *
- * @version $Id: SAXParserImpl.java,v 1.7 2010-11-01 04:40:06 joehw Exp $
  */
 public class SAXParserImpl extends javax.xml.parsers.SAXParser
     implements JAXPConstants, PSVIProvider {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
 /**
  * <p>Parser configuration for Xerces' XMLSchemaValidator.</p>
  *
- * @version $Id: SchemaValidatorConfiguration.java,v 1.5 2010-11-01 04:40:06 joehw Exp $
  */
 final class SchemaValidatorConfiguration implements XMLComponentManager {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -39,7 +39,6 @@
  * Events are forwarded to the registered XMLDTDHandler without modification.</p>
  *
  * @author Michael Glavassevich, IBM
- * @version $Id: UnparsedEntityHandler.java,v 1.6 2010-11-01 04:40:07 joehw Exp $
  */
 final class UnparsedEntityHandler implements XMLDTDFilter, EntityState {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -58,7 +58,6 @@
  *
  * @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a>
  * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @version $Id: DatatypeFactoryImpl.java,v 1.6 2010/05/19 05:02:55 joehw Exp $
  */
 public class DatatypeFactoryImpl
         extends DatatypeFactory {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -46,7 +46,6 @@
  *
  * @author <a href="mailto:Vikram.Aroskar@Sun.COM">Vikram Aroskar</a>
  * @author <a href="mailto:Huizhe.wang@oracle.com">Joe Wang</a>
- * @version $Revision: 1.2 $, $Date: 2010/05/19 23:20:06 $
 
  * @see XMLGregorianCalendar#add(Duration)
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -21,6 +21,7 @@
 
 package com.sun.org.apache.xerces.internal.jaxp.datatype;
 
+import com.sun.org.apache.xerces.internal.util.DatatypeMessageFormatter;
 import java.io.IOException;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
@@ -30,13 +31,10 @@
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
-
 import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.Duration;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import com.sun.org.apache.xerces.internal.util.DatatypeMessageFormatter;
-
 /**
  * <p>Immutable representation of a time span as defined in
  * the W3C XML Schema 1.0 specification.</p>
@@ -99,7 +97,6 @@
  *
  * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
  * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a>
- * @version $Revision: 1.8 $, $Date: 2010/05/19 23:20:06 $
 
  * @see XMLGregorianCalendar#add(Duration)
  */
@@ -120,29 +117,24 @@
         DatatypeConstants.SECONDS
     };
 
-    /**
-                 * <p>Internal array of value Field ids.</p>
-                 */
-                private static final int[] FIELD_IDS = {
-                                DatatypeConstants.YEARS.getId(),
-                                DatatypeConstants.MONTHS.getId(),
-                                DatatypeConstants.DAYS.getId(),
-                                DatatypeConstants.HOURS.getId(),
-                                DatatypeConstants.MINUTES.getId(),
-                                DatatypeConstants.SECONDS.getId()
-                        };
 
     /**
      * TimeZone for GMT.
      */
     private static final TimeZone GMT = TimeZone.getTimeZone("GMT");
 
-        /**
+    /**
      * <p>BigDecimal value of 0.</p>
      */
     private static final BigDecimal ZERO = BigDecimal.valueOf(0);
 
     /**
+     * BigInteger value of Integer's max value.</p>
+     */
+    private static final BigInteger MaxIntAsBigInt =
+            BigInteger.valueOf((long) Integer.MAX_VALUE);
+
+    /**
      * <p>Indicates the sign. -1, 0 or 1 if the duration is negative,
      * zero, or positive.</p>
      */
@@ -195,12 +187,12 @@
         return signum;
     }
 
-        /**
-         * TODO: Javadoc
-         * @param isPositive Sign.
-         *
-         * @return 1 if positive, else -1.
-         */
+    /**
+     * Determine the sign of the duration.
+     *
+     * @param isPositive Sign.
+     * @return 1 if positive, -1 negative, or 0 if all fields are zero.
+     */
     protected int calcSignum(boolean isPositive) {
         if ((years == null || years.signum() == 0)
              && (months == null || months.signum() == 0)
@@ -694,209 +686,71 @@
         XMLGregorianCalendarImpl.parse("1903-07-01T00:00:00Z")
     };
 
-        /**
-         * <p>Partial order relation comparison with this <code>Duration</code> instance.</p>
-         *
-         * <p>Comparison result must be in accordance with
-         * <a href="http://www.w3.org/TR/xmlschema-2/#duration-order">W3C XML Schema 1.0 Part 2, Section 3.2.7.6.2,
-         * <i>Order relation on duration</i></a>.</p>
-         *
-         * <p>Return:</p>
-         * <ul>
-         *   <li>{@link DatatypeConstants#LESSER} if this <code>Duration</code> is shorter than <code>duration</code> parameter</li>
-         *   <li>{@link DatatypeConstants#EQUAL} if this <code>Duration</code> is equal to <code>duration</code> parameter</li>
-         *   <li>{@link DatatypeConstants#GREATER} if this <code>Duration</code> is longer than <code>duration</code> parameter</li>
-         *   <li>{@link DatatypeConstants#INDETERMINATE} if a conclusive partial order relation cannot be determined</li>
-         * </ul>
-         *
-         * @param duration to compare
-         *
-         * @return the relationship between <code>this</code> <code>Duration</code>and <code>duration</code> parameter as
-         *   {@link DatatypeConstants#LESSER}, {@link DatatypeConstants#EQUAL}, {@link DatatypeConstants#GREATER}
-         *   or {@link DatatypeConstants#INDETERMINATE}.
-         *
-         * @throws UnsupportedOperationException If the underlying implementation
-         *   cannot reasonably process the request, e.g. W3C XML Schema allows for
-         *   arbitrarily large/small/precise values, the request may be beyond the
-         *   implementations capability.
-         * @throws NullPointerException if <code>duration</code> is <code>null</code>.
-         *
-         * @see #isShorterThan(Duration)
-         * @see #isLongerThan(Duration)
-         */
+    /**
+     * <p>Partial order relation comparison with this <code>Duration</code> instance.</p>
+     *
+     * <p>Comparison result must be in accordance with
+     * <a href="http://www.w3.org/TR/xmlschema-2/#duration-order">W3C XML Schema 1.0 Part 2, Section 3.2.7.6.2,
+     * <i>Order relation on duration</i></a>.</p>
+     *
+     * <p>Return:</p>
+     * <ul>
+     *   <li>{@link DatatypeConstants#LESSER} if this <code>Duration</code> is shorter than <code>duration</code> parameter</li>
+     *   <li>{@link DatatypeConstants#EQUAL} if this <code>Duration</code> is equal to <code>duration</code> parameter</li>
+     *   <li>{@link DatatypeConstants#GREATER} if this <code>Duration</code> is longer than <code>duration</code> parameter</li>
+     *   <li>{@link DatatypeConstants#INDETERMINATE} if a conclusive partial order relation cannot be determined</li>
+     * </ul>
+     *
+     * @param duration to compare
+     *
+     * @return the relationship between <code>this</code> <code>Duration</code>and <code>duration</code> parameter as
+     *   {@link DatatypeConstants#LESSER}, {@link DatatypeConstants#EQUAL}, {@link DatatypeConstants#GREATER}
+     *   or {@link DatatypeConstants#INDETERMINATE}.
+     *
+     * @throws UnsupportedOperationException If the underlying implementation
+     *   cannot reasonably process the request, e.g. W3C XML Schema allows for
+     *   arbitrarily large/small/precise values, the request may be beyond the
+     *   implementations capability.
+     * @throws NullPointerException if <code>duration</code> is <code>null</code>.
+     *
+     * @see #isShorterThan(Duration)
+     * @see #isLongerThan(Duration)
+     */
     public int compare(Duration rhs) {
-
-        BigInteger maxintAsBigInteger = BigInteger.valueOf(Integer.MAX_VALUE);
-
-        // check for fields that are too large in this Duration
-        if (years != null && years.compareTo(maxintAsBigInteger) == 1) {
-            throw new UnsupportedOperationException(
-                        DatatypeMessageFormatter.formatMessage(null, "TooLarge",
-                            new Object[]{this.getClass().getName() + "#compare(Duration duration)" + DatatypeConstants.YEARS.toString(), years.toString()})
-                                        //this.getClass().getName() + "#compare(Duration duration)"
-                                                //+ " years too large to be supported by this implementation "
-                                                //+ years.toString()
-                                        );
-        }
-        if (months != null && months.compareTo(maxintAsBigInteger) == 1) {
-                throw new UnsupportedOperationException(
-                        DatatypeMessageFormatter.formatMessage(null, "TooLarge",
-                            new Object[]{this.getClass().getName() + "#compare(Duration duration)" + DatatypeConstants.MONTHS.toString(), months.toString()})
-
-                                        //this.getClass().getName() + "#compare(Duration duration)"
-                                                //+ " months too large to be supported by this implementation "
-                                                //+ months.toString()
-                                        );
-        }
-        if (days != null && days.compareTo(maxintAsBigInteger) == 1) {
-                throw new UnsupportedOperationException(
-                        DatatypeMessageFormatter.formatMessage(null, "TooLarge",
-                            new Object[]{this.getClass().getName() + "#compare(Duration duration)" + DatatypeConstants.DAYS.toString(), days.toString()})
-
-                                        //this.getClass().getName() + "#compare(Duration duration)"
-                                                //+ " days too large to be supported by this implementation "
-                                                //+ days.toString()
-                                        );
-        }
-        if (hours != null && hours.compareTo(maxintAsBigInteger) == 1) {
-                throw new UnsupportedOperationException(
-                        DatatypeMessageFormatter.formatMessage(null, "TooLarge",
-                            new Object[]{this.getClass().getName() + "#compare(Duration duration)" + DatatypeConstants.HOURS.toString(), hours.toString()})
-
-                                        //this.getClass().getName() + "#compare(Duration duration)"
-                                                //+ " hours too large to be supported by this implementation "
-                                                //+ hours.toString()
-                                        );
-        }
-        if (minutes != null && minutes.compareTo(maxintAsBigInteger) == 1) {
-                throw new UnsupportedOperationException(
-                        DatatypeMessageFormatter.formatMessage(null, "TooLarge",
-                            new Object[]{this.getClass().getName() + "#compare(Duration duration)" + DatatypeConstants.MINUTES.toString(), minutes.toString()})
-
-                                        //this.getClass().getName() + "#compare(Duration duration)"
-                                                //+ " minutes too large to be supported by this implementation "
-                                                //+ minutes.toString()
-                                        );
-        }
-        if (seconds != null && seconds.toBigInteger().compareTo(maxintAsBigInteger) == 1) {
-                throw new UnsupportedOperationException(
-                        DatatypeMessageFormatter.formatMessage(null, "TooLarge",
-                            new Object[]{this.getClass().getName() + "#compare(Duration duration)" + DatatypeConstants.SECONDS.toString(), toString(seconds)})
-
-                                        //this.getClass().getName() + "#compare(Duration duration)"
-                                                //+ " seconds too large to be supported by this implementation "
-                                                //+ seconds.toString()
-                                        );
+        /** check if any field in the Durations is too large for the operation
+         * that uses XMLGregorianCalendar for comparison
+        */
+        for (DatatypeConstants.Field field : FIELDS) {
+            checkMaxValue(getField(field), field);
+            checkMaxValue(rhs.getField(field), field);
         }
 
-        // check for fields that are too large in rhs Duration
-        BigInteger rhsYears = (BigInteger) rhs.getField(DatatypeConstants.YEARS);
-        if (rhsYears != null && rhsYears.compareTo(maxintAsBigInteger) == 1) {
-                throw new UnsupportedOperationException(
-                        DatatypeMessageFormatter.formatMessage(null, "TooLarge",
-                            new Object[]{this.getClass().getName() + "#compare(Duration duration)" + DatatypeConstants.YEARS.toString(), rhsYears.toString()})
-
-                                        //this.getClass().getName() + "#compare(Duration duration)"
-                                                //+ " years too large to be supported by this implementation "
-                                                //+ rhsYears.toString()
-                                        );
-        }
-        BigInteger rhsMonths = (BigInteger) rhs.getField(DatatypeConstants.MONTHS);
-        if (rhsMonths != null && rhsMonths.compareTo(maxintAsBigInteger) == 1) {
-                throw new UnsupportedOperationException(
-                        DatatypeMessageFormatter.formatMessage(null, "TooLarge",
-                            new Object[]{this.getClass().getName() + "#compare(Duration duration)" + DatatypeConstants.MONTHS.toString(), rhsMonths.toString()})
-
-                                        //this.getClass().getName() + "#compare(Duration duration)"
-                                                //+ " months too large to be supported by this implementation "
-                                                //+ rhsMonths.toString()
-                                        );
-        }
-        BigInteger rhsDays = (BigInteger) rhs.getField(DatatypeConstants.DAYS);
-        if (rhsDays != null && rhsDays.compareTo(maxintAsBigInteger) == 1) {
-                throw new UnsupportedOperationException(
-                        DatatypeMessageFormatter.formatMessage(null, "TooLarge",
-                            new Object[]{this.getClass().getName() + "#compare(Duration duration)" + DatatypeConstants.DAYS.toString(), rhsDays.toString()})
+        return compareDates(this, rhs);
+    }
 
-                                        //this.getClass().getName() + "#compare(Duration duration)"
-                                                //+ " days too large to be supported by this implementation "
-                                                //+ rhsDays.toString()
-                                        );
-        }
-        BigInteger rhsHours = (BigInteger) rhs.getField(DatatypeConstants.HOURS);
-        if (rhsHours != null && rhsHours.compareTo(maxintAsBigInteger) == 1) {
-                throw new UnsupportedOperationException(
-                        DatatypeMessageFormatter.formatMessage(null, "TooLarge",
-                            new Object[]{this.getClass().getName() + "#compare(Duration duration)" + DatatypeConstants.HOURS.toString(), rhsHours.toString()})
-
-                                        //this.getClass().getName() + "#compare(Duration duration)"
-                                                //+ " hours too large to be supported by this implementation "
-                                                //+ rhsHours.toString()
-                                        );
-        }
-        BigInteger rhsMinutes = (BigInteger) rhs.getField(DatatypeConstants.MINUTES);
-        if (rhsMinutes != null && rhsMinutes.compareTo(maxintAsBigInteger) == 1) {
-                throw new UnsupportedOperationException(
-                        DatatypeMessageFormatter.formatMessage(null, "TooLarge",
-                            new Object[]{this.getClass().getName() + "#compare(Duration duration)" + DatatypeConstants.MINUTES.toString(), rhsMinutes.toString()})
-
-                                        //this.getClass().getName() + "#compare(Duration duration)"
-                                                //+ " minutes too large to be supported by this implementation "
-                                                //+ rhsMinutes.toString()
-                                        );
-        }
-        BigDecimal rhsSecondsAsBigDecimal = (BigDecimal) rhs.getField(DatatypeConstants.SECONDS);
-        BigInteger rhsSeconds = null;
-        if ( rhsSecondsAsBigDecimal != null ) {
-                rhsSeconds =  rhsSecondsAsBigDecimal.toBigInteger();
-        }
-        if (rhsSeconds != null && rhsSeconds.compareTo(maxintAsBigInteger) == 1) {
-                throw new UnsupportedOperationException(
-                        DatatypeMessageFormatter.formatMessage(null, "TooLarge",
-                            new Object[]{this.getClass().getName() + "#compare(Duration duration)" + DatatypeConstants.SECONDS.toString(), rhsSeconds.toString()})
-
-                                        //this.getClass().getName() + "#compare(Duration duration)"
-                                                //+ " seconds too large to be supported by this implementation "
-                                                //+ rhsSeconds.toString()
-                                        );
+    /**
+     * Check if a field exceeds the maximum value
+     * @param field the value of a field
+     * @param fieldType type of the field, e.g. year, month, day, hour, minute or second.
+     */
+    private void checkMaxValue(Number field, DatatypeConstants.Field fieldType) {
+        BigInteger fieldValue = null;
+        if (fieldType != DatatypeConstants.SECONDS) {
+            fieldValue = (BigInteger) field;
+        } else {
+            BigDecimal rhsSecondsAsBigDecimal = (BigDecimal) field;
+            if ( rhsSecondsAsBigDecimal != null ) {
+                fieldValue =  rhsSecondsAsBigDecimal.toBigInteger();
+            }
         }
 
-        // turn this Duration into a GregorianCalendar
-        GregorianCalendar lhsCalendar = new GregorianCalendar(
-                        1970,
-                                1,
-                                1,
-                                0,
-                                0,
-                                0);
-                lhsCalendar.add(GregorianCalendar.YEAR, getYears() * getSign());
-                lhsCalendar.add(GregorianCalendar.MONTH, getMonths() * getSign());
-                lhsCalendar.add(GregorianCalendar.DAY_OF_YEAR, getDays() * getSign());
-                lhsCalendar.add(GregorianCalendar.HOUR_OF_DAY, getHours() * getSign());
-                lhsCalendar.add(GregorianCalendar.MINUTE, getMinutes() * getSign());
-                lhsCalendar.add(GregorianCalendar.SECOND, getSeconds() * getSign());
-
-                // turn compare Duration into a GregorianCalendar
-        GregorianCalendar rhsCalendar = new GregorianCalendar(
-                                1970,
-                                1,
-                                1,
-                                0,
-                                0,
-                                0);
-                rhsCalendar.add(GregorianCalendar.YEAR, rhs.getYears() * rhs.getSign());
-                rhsCalendar.add(GregorianCalendar.MONTH, rhs.getMonths() * rhs.getSign());
-                rhsCalendar.add(GregorianCalendar.DAY_OF_YEAR, rhs.getDays() * rhs.getSign());
-                rhsCalendar.add(GregorianCalendar.HOUR_OF_DAY, rhs.getHours() * rhs.getSign());
-                rhsCalendar.add(GregorianCalendar.MINUTE, rhs.getMinutes() * rhs.getSign());
-                rhsCalendar.add(GregorianCalendar.SECOND, rhs.getSeconds() * rhs.getSign());
-
-
-                if (lhsCalendar.equals(rhsCalendar)) {
-                        return DatatypeConstants.EQUAL;
-                }
-
-                return compareDates(this, rhs);
+        if (fieldValue != null && fieldValue.compareTo(MaxIntAsBigInt) == 1) {
+            throw new UnsupportedOperationException(
+                    DatatypeMessageFormatter.formatMessage(null, "TooLarge",
+                    new Object[]{this.getClass().getName() + "#compare(Duration duration)"
+                    + fieldType, field.toString()})
+            );
+        }
     }
 
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -42,7 +42,6 @@
  *
  * @author <a href="mailto:Vikram.Aroskar@Sun.COM">Vikram Aroskar</a>
  * @author <a href="mailto:Huizhe.wang@oracle.com">Joe Wang</a>
- * @version $Revision: 1.1 $, $Date: 2010/05/19 05:02:55 $
 
  * @see XMLGregorianCalendar#add(Duration)
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -188,7 +188,6 @@
  * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
  * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a>
  * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
- * @version $Revision: 1.14 $, $Date: 2010-11-10 07:41:41 $
  * @see javax.xml.datatype.Duration
  * @since 1.5
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java	Wed Jul 09 10:41:31 2014 -0700
@@ -30,7 +30,6 @@
  * <p>Abstract implementation of Schema for W3C XML Schemas.</p>
  *
  * @author Michael Glavassevich, IBM
- * @version $Id: AbstractXMLSchema.java,v 1.6 2010-11-01 04:40:07 joehw Exp $
  */
 abstract class AbstractXMLSchema extends Schema implements
         XSGrammarPoolContainer {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java	Wed Jul 09 10:41:31 2014 -0700
@@ -63,7 +63,6 @@
  * <p>A validator helper for <code>DOMSource</code>s.</p>
  *
  * @author Michael Glavassevich, IBM
- * @version $Id: DOMValidatorHelper.java,v 1.9 2010-11-01 04:40:08 joehw Exp $
  */
 final class DOMValidatorHelper implements ValidatorHelper, EntityState {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java	Wed Jul 09 10:41:31 2014 -0700
@@ -29,7 +29,6 @@
  * which contains no schema components.</p>
  *
  * @author Michael Glavassevich, IBM
- * @version $Id: EmptyXMLSchema.java,v 1.6 2010-11-01 04:40:08 joehw Exp $
  */
 final class EmptyXMLSchema extends AbstractXMLSchema implements XMLGrammarPool {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -29,7 +29,6 @@
  * <p>Used to format JAXP Validation API error messages using a specified locale.</p>
  *
  * @author Michael Glavassevich, IBM
- * @version $Id: JAXPValidationMessageFormatter.java,v 1.5 2010-11-01 04:40:08 joehw Exp $
  */
 final class JAXPValidationMessageFormatter {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java	Wed Jul 09 10:41:31 2014 -0700
@@ -48,7 +48,6 @@
  *
  * @author Michael Glavassevich, IBM
  * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
- * @version $Id: StreamValidatorHelper.java,v 1.7 2010-11-01 04:40:08 joehw Exp $
  */
 final class StreamValidatorHelper implements ValidatorHelper {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -94,7 +94,6 @@
  * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: ValidatorHandlerImpl.java,v 1.10 2010-11-01 04:40:08 joehw Exp $
  */
 final class ValidatorHandlerImpl extends ValidatorHandler implements
     DTDHandler, EntityState, PSVIProvider, ValidatorHelper, XMLDocumentHandler {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -51,7 +51,6 @@
  * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
  * @author Michael Glavassevich, IBM
  * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
- * @version $Id: ValidatorImpl.java,v 1.10 2010-11-01 04:40:08 joehw Exp $
  */
 final class ValidatorImpl extends Validator implements PSVIProvider {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -65,7 +65,6 @@
  * {@link SchemaFactory} for XML Schema.
  *
  * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
- * @version $Id: XMLSchemaFactory.java,v 1.11 2010-11-01 04:40:08 joehw Exp $
  */
 public final class XMLSchemaFactory extends SchemaFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java	Wed Jul 09 10:41:31 2014 -0700
@@ -55,7 +55,6 @@
  * <p>An implementation of XMLComponentManager for a schema validator.</p>
  *
  * @author Michael Glavassevich, IBM
- * @version $Id: XMLSchemaValidatorComponentManager.java,v 1.9 2010-11-01 04:40:08 joehw Exp $
  */
 final class XMLSchemaValidatorComponentManager extends ParserConfigurationSettings implements
         XMLComponentManager {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java	Wed Jul 09 10:41:31 2014 -0700
@@ -26,7 +26,6 @@
  * <p>A container for grammar pools which only contain schema grammars.</p>
  *
  * @author Michael Glavassevich, IBM
- * @version $Id: XSGrammarPoolContainer.java,v 1.6 2010-11-01 04:40:08 joehw Exp $
  */
 public interface XSGrammarPoolContainer {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -85,7 +85,6 @@
  * @author Andy Clark, IBM
  * @author Elena Litani, IBM
  *
- * @version $Id: AbstractDOMParser.java,v 1.10 2010-11-01 04:40:09 joehw Exp $
  */
 public class AbstractDOMParser extends AbstractXMLDocumentParser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -77,7 +77,6 @@
  * @author Arnaud Le Hors, IBM
  * @author Andy Clark, IBM
  *
- * @version $Id: AbstractSAXParser.java,v 1.6 2010-11-01 04:40:09 joehw Exp $
  */
 public abstract class AbstractSAXParser
     extends AbstractXMLDocumentParser
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java	Wed Jul 09 10:41:31 2014 -0700
@@ -94,7 +94,6 @@
  * @author Arnaud  Le Hors, IBM
  * @author Andy Clark, IBM
  *
- * @version $Id: BasicParserConfiguration.java,v 1.6 2010-11-01 04:40:09 joehw Exp $
  */
 public abstract class BasicParserConfiguration
     extends ParserConfigurationSettings
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -58,7 +58,6 @@
  * @author Arnaud  Le Hors, IBM
  * @author Andy Clark, IBM
  *
- * @version $Id: DOMParser.java,v 1.7 2010-11-01 04:40:09 joehw Exp $
  */
 public class DOMParser
     extends AbstractDOMParser {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -79,7 +79,6 @@
  * @author Pavani Mukthipudi, Sun Microsystems Inc.
  * @author Elena Litani, IBM
  * @author Rahul Srivastava, Sun Microsystems Inc.
- * @version $Id: DOMParserImpl.java,v 1.8 2010-11-01 04:40:09 joehw Exp $
  */
 
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java	Wed Jul 09 10:41:31 2014 -0700
@@ -87,7 +87,6 @@
  * @author Andy Clark, IBM
  * @author Neil Graham, IBM
  *
- * @version $Id: DTDConfiguration.java,v 1.7 2010-11-01 04:40:09 joehw Exp $
  */
 public class DTDConfiguration
     extends BasicParserConfiguration
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java	Wed Jul 09 10:41:31 2014 -0700
@@ -59,7 +59,6 @@
  * include the replacement text of internal entities, and supply default attribute values".
  *
  * @author Elena Litani, IBM
- * @version $Id: NonValidatingConfiguration.java,v 1.7 2010-11-01 04:40:09 joehw Exp $
  */
 public class NonValidatingConfiguration
     extends BasicParserConfiguration
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -37,7 +37,6 @@
  * @author Arnaud  Le Hors, IBM
  * @author Andy Clark, IBM
  *
- * @version $Id: SAXParser.java,v 1.7 2010-11-01 04:40:09 joehw Exp $
  */
 public class SAXParser
     extends AbstractSAXParser {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java	Wed Jul 09 10:41:31 2014 -0700
@@ -44,7 +44,6 @@
  *
  * @author Neil Graham, IBM
  *
- * @version $Id: SecurityConfiguration.java,v 1.6 2010-11-01 04:40:09 joehw Exp $
  */
 public class SecurityConfiguration extends XIncludeAwareParserConfiguration
 {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java	Wed Jul 09 10:41:31 2014 -0700
@@ -64,7 +64,6 @@
  * @author Arnaud  Le Hors, IBM
  * @author Andy Clark, IBM
  *
- * @version $Id: StandardParserConfiguration.java,v 1.7 2010-11-01 04:40:10 joehw Exp $
  */
 public class StandardParserConfiguration
     extends DTDConfiguration {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java	Wed Jul 09 10:41:31 2014 -0700
@@ -39,7 +39,6 @@
  *
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: XIncludeAwareParserConfiguration.java,v 1.5 2010-11-01 04:40:10 joehw Exp $
  */
 public class XIncludeAwareParserConfiguration extends XML11Configuration {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java	Wed Jul 09 10:41:31 2014 -0700
@@ -78,7 +78,6 @@
  * @author Neil Graham, IBM
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: XML11Configuration.java,v 1.9 2010-11-01 04:40:10 joehw Exp $
  */
 public class XML11Configuration extends ParserConfigurationSettings
     implements XMLPullParserConfiguration, XML11Configurable {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java	Wed Jul 09 10:41:31 2014 -0700
@@ -103,7 +103,6 @@
  * @author Michael Glavassevich, IBM
  * @author John Kim, IBM
  *
- * @version $Id: XML11DTDConfiguration.java,v 1.5 2010-11-01 04:40:10 joehw Exp $
  */
 public class XML11DTDConfiguration extends ParserConfigurationSettings
     implements XMLPullParserConfiguration, XML11Configurable {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java	Wed Jul 09 10:41:31 2014 -0700
@@ -74,7 +74,6 @@
  * @author John Kim, IBM
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: XML11NonValidatingConfiguration.java,v 1.5 2010-11-01 04:40:10 joehw Exp $
  */
 public class XML11NonValidatingConfiguration extends ParserConfigurationSettings
     implements XMLPullParserConfiguration, XML11Configurable {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -33,7 +33,6 @@
  * @author Arnaud  Le Hors, IBM
  * @author Andy Clark, IBM
  *
- * @version $Id: XMLDocumentParser.java,v 1.6 2010-11-01 04:40:10 joehw Exp $
  */
 public class XMLDocumentParser
     extends AbstractXMLDocumentParser {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java	Wed Jul 09 10:41:31 2014 -0700
@@ -62,7 +62,6 @@
  *
  * @author Neil Graham, IBM
  *
- * @version $Id: XMLGrammarCachingConfiguration.java,v 1.6 2010-11-01 04:40:10 joehw Exp $
  */
 public class XMLGrammarCachingConfiguration
     extends XIncludeAwareParserConfiguration {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -25,7 +25,6 @@
 import com.sun.org.apache.xerces.internal.util.SymbolTable;
 
 /**
- * @version $Id: XMLGrammarParser.java,v 1.6 2010-11-01 04:40:10 joehw Exp $
  */
 public abstract class XMLGrammarParser
     extends XMLParser {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -49,7 +49,6 @@
  *
  * @author Neil Graham, IBM
  *
- * @version $Id: XMLGrammarPreparser.java,v 1.7 2010-11-01 04:40:10 joehw Exp $
  */
 public class XMLGrammarPreparser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -49,7 +49,6 @@
  * @author Arnaud  Le Hors, IBM
  * @author Andy Clark, IBM
  *
- * @version $Id: XMLParser.java,v 1.5 2007/07/20 14:11:21 spericas Exp $
  */
 public abstract class XMLParser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java	Wed Jul 09 10:41:31 2014 -0700
@@ -42,7 +42,6 @@
  * (such as a DTM), we should easily be able to convert our schema
  * parsing to utilize it.
  *
- * @version $Id: DOMUtil.java,v 1.7 2010-11-01 04:40:14 joehw Exp $
  */
 public class DOMUtil {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -29,7 +29,6 @@
  * <p>Used to format JAXP 1.3 Datatype API error messages using a specified locale.</p>
  *
  * @author  Neeraj Bajaj, Sun Microsystems
- * @version $Id: DatatypeMessageFormatter.java,v 1.6 2010-11-01 04:40:14 joehw Exp $
  */
 public class DatatypeMessageFormatter {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java	Wed Jul 09 10:41:31 2014 -0700
@@ -470,7 +470,6 @@
  * @author TAMURA Kent, IBM
  * @author Andy Clark, IBM
  *
- * @version $Id$
  */
 public class EncodingMap {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java	Wed Jul 09 10:41:31 2014 -0700
@@ -37,7 +37,6 @@
  *
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: JAXPNamespaceContextWrapper.java,v 1.2 2010-10-26 23:01:13 joehw Exp $
  */
 public final class JAXPNamespaceContextWrapper implements NamespaceContext {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java	Wed Jul 09 10:41:31 2014 -0700
@@ -43,7 +43,6 @@
  *
  * @author Andy Clark, IBM
  *
- * @version $Id: ParserConfigurationSettings.java,v 1.6 2010-11-01 04:40:14 joehw Exp $
  */
 public class ParserConfigurationSettings
     implements XMLComponentManager {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -29,7 +29,6 @@
  *
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: SAXMessageFormatter.java,v 1.6 2010-11-01 04:40:14 joehw Exp $
  */
 public class SAXMessageFormatter {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/util/StAXInputSource.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/StAXInputSource.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/StAXInputSource.java	Wed Jul 09 10:41:31 2014 -0700
@@ -30,7 +30,6 @@
 /**
  * <p>An <code>XMLInputSource</code> analogue to <code>javax.xml.transform.stax.StAXSource</code>.</p>
  *
- * @version $Id: StAXInputSource.java,v 1.2 2010-10-26 23:01:17 joehw Exp $
  */
 public final class StAXInputSource extends XMLInputSource {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  *
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: StAXLocationWrapper.java,v 1.2 2010-10-26 23:01:13 joehw Exp $
  */
 public final class StAXLocationWrapper implements XMLLocator {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java	Wed Jul 09 10:41:31 2014 -0700
@@ -28,7 +28,6 @@
  * The hash code uses the same algorithm as SymbolTable class.
  *
  * @author Elena Litani
- * @version $Id: SymbolHash.java,v 1.7 2010-11-01 04:40:14 joehw Exp $
  */
 public class SymbolHash {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/util/XML11Char.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/XML11Char.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/XML11Char.java	Wed Jul 09 10:41:31 2014 -0700
@@ -41,7 +41,6 @@
  * @author Neil Graham, IBM
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: XML11Char.java,v 1.7 2010-11-01 04:40:15 joehw Exp $
  */
 public class XML11Char {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -83,7 +83,6 @@
  * @author Elena Litani, IBM
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: XMLAttributesImpl.java,v 1.7 2010/05/07 20:13:09 joehw Exp $
  */
 public class XMLAttributesImpl
 implements XMLAttributes, XMLBufferListener {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/util/XMLChar.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLChar.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLChar.java	Wed Jul 09 10:41:31 2014 -0700
@@ -44,7 +44,6 @@
  * @author Michael Glavassevich, IBM
  * @author Rahul Srivastava, Sun Microsystems Inc.
  *
- * @version $Id: XMLChar.java,v 1.7 2010-11-01 04:40:15 joehw Exp $
  */
 public class XMLChar {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  * when bundled as part of the JDK.
  * <p>
  *
- * @version $Id: ObjectFactory.java,v 1.6 2010/04/23 01:44:34 joehw Exp $
  */
 public final class ObjectFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -115,7 +115,6 @@
  * @author Peter McCracken, IBM
  * @author Michael Glavassevich, IBM
  *
- * @version $Id: XIncludeHandler.java,v 1.7 2010-11-01 04:40:18 joehw Exp $
  *
  * @see XIncludeNamespaceSupport
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  *
  * @author Peter McCracken, IBM
  *
- * @version $Id: XIncludeMessageFormatter.java,v 1.7 2010-11-01 04:40:18 joehw Exp $
  */
 public class XIncludeMessageFormatter implements MessageFormatter {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/xni/QName.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/xni/QName.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/xni/QName.java	Wed Jul 09 10:41:31 2014 -0700
@@ -77,7 +77,6 @@
  * == were used to compare strings
  * @author Joe Wang, Oracle
  *
- * @version $Id: QName.java,v 1.6 2010/03/18 19:32:31 joehw Exp $
  */
 public class QName
 implements Cloneable {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/xni/XNIException.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/xni/XNIException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/xni/XNIException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
  *
  * @author Andy Clark, IBM
  *
- * @version $Id: XNIException.java,v 1.6 2010-11-01 04:40:19 joehw Exp $
  */
 public class XNIException
     extends RuntimeException {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java	Wed Jul 09 10:41:31 2014 -0700
@@ -36,7 +36,6 @@
  *
  * @author Andy Clark, IBM
  *
- * @version $Id: XMLComponentManager.java,v 1.6 2010-11-01 04:40:22 joehw Exp $
  */
 public interface XMLComponentManager {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -30,7 +30,6 @@
  *
  * @author Andy Clark, IBM
  *
- * @version $Id: XMLConfigurationException.java,v 1.7 2010-11-01 04:40:22 joehw Exp $
  */
 public class XMLConfigurationException
     extends XNIException {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java	Wed Jul 09 10:41:31 2014 -0700
@@ -38,7 +38,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: ElementSchemePointer.java,v 1.4 2009/06/11 23:51:50 joehw Exp $
  */
 final class ElementSchemePointer implements XPointerPart {
 
@@ -498,7 +497,6 @@
      * @xerces.internal
      *
      * @author Neil Delima, IBM
-     * @version $Id: ElementSchemePointer.java,v 1.4 2009/06/11 23:51:50 joehw Exp $
      *
      */
     private final class Tokens {
@@ -656,7 +654,6 @@
      *
      * @xerces.internal
      *
-     * @version $Id: ElementSchemePointer.java,v 1.4 2009/06/11 23:51:50 joehw Exp $
      */
     private class Scanner {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,7 +34,6 @@
  *
  * @xerces.internal
  *
- * @version $Id: XPointerMessageFormatter.java,v 1.5 2010-11-01 04:40:26 joehw Exp $
  */
 final class XPointerMessageFormatter implements MessageFormatter {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java	Wed Jul 09 10:41:31 2014 -0700
@@ -29,7 +29,6 @@
  *
  * @author Ankit Pasricha, IBM
  *
- * @version $Id: ByteList.java,v 1.7 2010-11-01 04:40:31 joehw Exp $
  */
 public interface ByteList extends List {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java
--- a/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java	Wed Jul 09 10:41:31 2014 -0700
@@ -27,7 +27,6 @@
  *
  * @author Ankit Pasricha, IBM
  *
- * @version $Id: ObjectList.java,v 1.7 2010-11-01 04:40:31 joehw Exp $
  */
 public interface ObjectList extends List {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java
--- a/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java	Wed Jul 09 10:41:31 2014 -0700
@@ -57,7 +57,6 @@
  * <p>The selection of CatalogParsers is made on the basis of the QName
  * of the root element of the document.</p>
  *
- * <p>This class requires the <a href="http://java.sun.com/aboutJava/communityprocess/final/jsr005/index.html">Java API for XML Parsing</a>.</p>
  *
  * @see Catalog
  * @see CatalogReader
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java
--- a/jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -72,7 +72,6 @@
  * @author Gopal Sharma, Sun Microsystems
  * @author Arun Yadav, Sun Microsystems
  * @author Sunitha Reddy, Sun Microsystems
- * @version $Id: DOMSerializerImpl.java,v 1.11 2010-11-01 04:40:36 joehw Exp $
  */
 public class DOMSerializerImpl implements LSSerializer, DOMConfiguration {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java
--- a/jaxp/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java	Wed Jul 09 10:41:31 2014 -0700
@@ -29,7 +29,6 @@
 /**
  * This class represents an encoding.
  *
- * @version $Id: EncodingInfo.java,v 1.6 2007/10/18 03:39:08 joehw Exp $
  */
 public class EncodingInfo {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java
--- a/jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
 /**
  *
  *
- * @version $Revision: 1.6 $ $Date: 2010-11-01 04:40:36 $
  * @author <a href="mailto:Scott_Boag/CAM/Lotus@lotus.com">Scott Boag</a>
  * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
--- a/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	Wed Jul 09 10:41:31 2014 -0700
@@ -50,7 +50,6 @@
  * to override encoding names and provide the last printable character
  * for each encoding.
  *
- * @version $Revision: 1.11 $ $Date: 2010-11-01 04:34:44 $
  * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
  */
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java
--- a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -52,7 +52,6 @@
 /**
  * The XPathExpression interface encapsulates a (compiled) XPath expression.
  *
- * @version $Revision: 1.10 $
  * @author  Ramesh Mandava
  */
 public class XPathExpressionImpl  implements javax.xml.xpath.XPathExpression{
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
--- a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -36,7 +36,6 @@
 /**
  * The XPathFactory builds XPaths.
  *
- * @version $Revision: 1.11 $
  * @author  Ramesh Mandava
  */
 public  class XPathFactoryImpl extends XPathFactory {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java
--- a/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -54,7 +54,6 @@
  * of an XPath expression.
  *
  *
- * @version $Revision: 1.10 $
  * @author  Ramesh Mandava
  */
 public class XPathImpl implements javax.xml.xpath.XPath {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/XMLConstants.java
--- a/jaxp/src/javax/xml/XMLConstants.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/XMLConstants.java	Wed Jul 09 10:41:31 2014 -0700
@@ -29,7 +29,6 @@
  * <p>Utility class to contain basic XML values as constants.</p>
  *
  * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @version $Revision: 1.8 $, $Date: 2010/05/25 16:19:45 $
  * @see <a href="http://www.w3.org/TR/xml11/">Extensible Markup Language (XML) 1.1</a>
  * @see <a href="http://www.w3.org/TR/REC-xml">Extensible Markup Language (XML) 1.0 (Second Edition)</a>
  * @see <a href="http://www.w3.org/XML/xml-V10-2e-errata">XML 1.0 Second Edition Specification Errata</a>
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/datatype/DatatypeFactory.java
--- a/jaxp/src/javax/xml/datatype/DatatypeFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/datatype/DatatypeFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -72,7 +72,6 @@
  * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
  * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
  *
- * @version $Revision: 1.13 $, $Date: 2010/03/11 23:10:53 $
  * @since 1.5
  */
 public abstract class DatatypeFactory {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/datatype/package.html
--- a/jaxp/src/javax/xml/datatype/package.html	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/datatype/package.html	Wed Jul 09 10:41:31 2014 -0700
@@ -31,7 +31,6 @@
 		<title>javax.xml.xpath</title>
 
 		<meta name="@author" content="mailto:Jeff.Suttor@Sun.com" />
-		<meta name="@version" content="$Revision: 1.2 $, $Date: 2005/06/10 03:50:27 $" />
 		<meta name="@see" content='<a href="http://www.w3.org/TR/xmlschema-2/#dateTime">W3C XML Schema 1.0 Part 2, Section 3.2.7-14</a>' />
 		<meta name="@see" content='<a href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">XQuery 1.0 and XPath 2.0 Data Model, xdt:dayTimeDuration</a>' />
 		<meta name="@see" content='<a href="http://www.w3.org/TR/xpath-datamodel#dt-yearMonthDuration">XQuery 1.0 and XPath 2.0 Data Model, xdt:yearMonthDuration</a>' />
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/namespace/QName.java
--- a/jaxp/src/javax/xml/namespace/QName.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/namespace/QName.java	Wed Jul 09 10:41:31 2014 -0700
@@ -62,7 +62,6 @@
  * <p><code>QName</code> is immutable.</p>
  *
  * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @version $Revision: 1.8 $, $Date: 2010/03/18 03:06:17 $
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#QName">
  *   XML Schema Part2: Datatypes specification</a>
  * @see <a href="http://www.w3.org/TR/REC-xml-names/#ns-qualnames">
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/parsers/DocumentBuilder.java
--- a/jaxp/src/javax/xml/parsers/DocumentBuilder.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/parsers/DocumentBuilder.java	Wed Jul 09 10:41:31 2014 -0700
@@ -57,6 +57,7 @@
  * communicate with the application using these existing APIs.
  *
  * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @since 1.4
  */
 
 public abstract class DocumentBuilder {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/parsers/DocumentBuilderFactory.java
--- a/jaxp/src/javax/xml/parsers/DocumentBuilderFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/parsers/DocumentBuilderFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,8 +34,7 @@
  * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
  * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
  *
- * @version $Revision: 1.9 $, $Date: 2010/05/25 16:19:44 $
-
+ * @since 1.4
  */
 
 public abstract class DocumentBuilderFactory {
@@ -440,6 +439,7 @@
      * @throws ParserConfigurationException if this <code>DocumentBuilderFactory</code> or the <code>DocumentBuilder</code>s
      *   it creates cannot support this feature.
      * @throws NullPointerException If the <code>name</code> parameter is null.
+     * @since 1.5
      */
     public abstract void setFeature(String name, boolean value)
             throws ParserConfigurationException;
@@ -461,6 +461,7 @@
      *
      * @throws ParserConfigurationException if this <code>DocumentBuilderFactory</code>
      *   or the <code>DocumentBuilder</code>s it creates cannot support this feature.
+     * @since 1.5
      */
     public abstract boolean getFeature(String name)
             throws ParserConfigurationException;
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/parsers/FactoryConfigurationError.java
--- a/jaxp/src/javax/xml/parsers/FactoryConfigurationError.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/parsers/FactoryConfigurationError.java	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,7 @@
  * or instantiated.
  *
  * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @version $Revision: 1.7 $, $Date: 2010-11-01 04:36:09 $
+ * @since 1.4
  */
 
 public class FactoryConfigurationError extends Error {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/parsers/ParserConfigurationException.java
--- a/jaxp/src/javax/xml/parsers/ParserConfigurationException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/parsers/ParserConfigurationException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -29,6 +29,7 @@
  * Indicates a serious configuration error.
  *
  * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @since 1.4
  */
 
 public class ParserConfigurationException extends Exception {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/parsers/SAXParser.java
--- a/jaxp/src/javax/xml/parsers/SAXParser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/parsers/SAXParser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -75,6 +75,7 @@
  * this revised class.
  *
  * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @since 1.4
  */
 public abstract class SAXParser {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/parsers/SAXParserFactory.java
--- a/jaxp/src/javax/xml/parsers/SAXParserFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/parsers/SAXParserFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -37,8 +37,7 @@
  * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
  * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
  *
- * @version $Revision: 1.9 $, $Date: 2010/05/25 16:19:44 $
- *
+ * @since 1.4
  */
 public abstract class SAXParserFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/ErrorListener.java
--- a/jaxp/src/javax/xml/transform/ErrorListener.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/ErrorListener.java	Wed Jul 09 10:41:31 2014 -0700
@@ -49,6 +49,8 @@
  *
  * <p><code>Transformer</code>s may use this mechanism to report XML parsing
  * errors as well as transformation errors.</p>
+ *
+ * @since 1.4
  */
 public interface ErrorListener {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/OutputKeys.java
--- a/jaxp/src/javax/xml/transform/OutputKeys.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/OutputKeys.java	Wed Jul 09 10:41:31 2014 -0700
@@ -33,6 +33,7 @@
  *
  * @see <a href="http://www.w3.org/TR/xslt#output">
  *  section 16 of the XSL Transformations (XSLT) W3C Recommendation</a>
+ * @since 1.4
  */
 public class OutputKeys {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/Result.java
--- a/jaxp/src/javax/xml/transform/Result.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/Result.java	Wed Jul 09 10:41:31 2014 -0700
@@ -30,6 +30,7 @@
  * needed to build a transformation result tree.</p>
  *
  * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @since 1.4
  */
 public interface Result {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/Source.java
--- a/jaxp/src/javax/xml/transform/Source.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/Source.java	Wed Jul 09 10:41:31 2014 -0700
@@ -28,6 +28,8 @@
 /**
  * An object that implements this interface contains the information
  * needed to act as source input (XML source or transformation instructions).
+ *
+ * @since 1.4
  */
 public interface Source {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/SourceLocator.java
--- a/jaxp/src/javax/xml/transform/SourceLocator.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/SourceLocator.java	Wed Jul 09 10:41:31 2014 -0700
@@ -28,6 +28,8 @@
 /**
  * This interface is primarily for the purposes of reporting where
  * an error occurred in the XML source or transformation instructions.
+ *
+ * @since 1.4
  */
 public interface SourceLocator {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/Templates.java
--- a/jaxp/src/javax/xml/transform/Templates.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/Templates.java	Wed Jul 09 10:41:31 2014 -0700
@@ -37,6 +37,8 @@
  * <p>Templates must be threadsafe for a given instance
  * over multiple threads running concurrently, and may
  * be used multiple times in a given session.</p>
+ *
+ * @since 1.4
  */
 public interface Templates {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/Transformer.java
--- a/jaxp/src/javax/xml/transform/Transformer.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/Transformer.java	Wed Jul 09 10:41:31 2014 -0700
@@ -45,6 +45,7 @@
  * output properties are preserved across transformations.</p>
  *
  * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @since 1.4
  */
 public abstract class Transformer {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/TransformerConfigurationException.java
--- a/jaxp/src/javax/xml/transform/TransformerConfigurationException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/TransformerConfigurationException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -27,6 +27,8 @@
 
 /**
  * Indicates a serious configuration error.
+ *
+ * @since 1.4
  */
 public class TransformerConfigurationException extends TransformerException {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/TransformerException.java
--- a/jaxp/src/javax/xml/transform/TransformerException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/TransformerException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -31,6 +31,8 @@
 /**
  * This class specifies an exceptional condition that occured
  * during the transformation process.
+ *
+ * @since 1.4
  */
 public class TransformerException extends Exception {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/TransformerFactoryConfigurationError.java
--- a/jaxp/src/javax/xml/transform/TransformerFactoryConfigurationError.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/TransformerFactoryConfigurationError.java	Wed Jul 09 10:41:31 2014 -0700
@@ -30,6 +30,8 @@
  * exists. This error will typically be thrown when the class of a
  * transformation factory specified in the system properties cannot be found
  * or instantiated.
+ *
+ * @since 1.4
  */
 public class TransformerFactoryConfigurationError extends Error {
     private static final long serialVersionUID = -6527718720676281516L;
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/URIResolver.java
--- a/jaxp/src/javax/xml/transform/URIResolver.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/URIResolver.java	Wed Jul 09 10:41:31 2014 -0700
@@ -28,6 +28,8 @@
 /**
  * <p>An object that implements this interface that can be called by the processor
  * to turn a URI used in document(), xsl:import, or xsl:include into a Source object.
+ *
+ * @since 1.4
  */
 public interface URIResolver {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/dom/DOMLocator.java
--- a/jaxp/src/javax/xml/transform/dom/DOMLocator.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/dom/DOMLocator.java	Wed Jul 09 10:41:31 2014 -0700
@@ -37,6 +37,8 @@
  * object returned by an exception. A {@link javax.xml.transform.Transformer}
  * may use this object for purposes other than error reporting, for instance,
  * to indicate the source node that originated a result node.
+ *
+ * @since 1.4
  */
 public interface DOMLocator extends SourceLocator {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/dom/DOMResult.java
--- a/jaxp/src/javax/xml/transform/dom/DOMResult.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/dom/DOMResult.java	Wed Jul 09 10:41:31 2014 -0700
@@ -35,6 +35,7 @@
  * which may be retrieved with {@link #getNode()}.</p>
  *
  * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @since 1.4
  */
 public class DOMResult implements Result {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/dom/DOMSource.java
--- a/jaxp/src/javax/xml/transform/dom/DOMSource.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/dom/DOMSource.java	Wed Jul 09 10:41:31 2014 -0700
@@ -40,6 +40,7 @@
  *
  * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
  * @see <a href="http://www.w3.org/TR/DOM-Level-2">Document Object Model (DOM) Level 2 Specification</a>
+ * @since 1.4
  */
 public class DOMSource implements Source {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/sax/SAXResult.java
--- a/jaxp/src/javax/xml/transform/sax/SAXResult.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/sax/SAXResult.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,6 +34,7 @@
  * <p>Acts as an holder for a transformation Result.</p>
  *
  * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @since 1.4
  */
 public class SAXResult implements Result {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/sax/SAXSource.java
--- a/jaxp/src/javax/xml/transform/sax/SAXSource.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/sax/SAXSource.java	Wed Jul 09 10:41:31 2014 -0700
@@ -41,6 +41,7 @@
  * {@link javax.xml.parsers.SAXParserFactory#setNamespaceAware(boolean awareness)} method.</p>
  *
  * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @since 1.4
  */
 public class SAXSource implements Source {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/sax/SAXTransformerFactory.java
--- a/jaxp/src/javax/xml/transform/sax/SAXTransformerFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/sax/SAXTransformerFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -39,6 +39,8 @@
  * for an XMLReader used during a transformation, it should use a URIResolver
  * to return the SAXSource which provides (with getXMLReader) a reference to
  * the XMLReader.</p>
+ *
+ * @since 1.4
  */
 public abstract class SAXTransformerFactory extends TransformerFactory {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/sax/TemplatesHandler.java
--- a/jaxp/src/javax/xml/transform/sax/TemplatesHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/sax/TemplatesHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -34,6 +34,8 @@
  * parse events (parsing transformation instructions) into a Templates object.
  *
  * <p>Note that TemplatesHandler does not need to implement LexicalHandler.</p>
+ *
+ * @since 1.4
  */
 public interface TemplatesHandler extends ContentHandler {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/sax/TransformerHandler.java
--- a/jaxp/src/javax/xml/transform/sax/TransformerHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/sax/TransformerHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -36,6 +36,8 @@
  * A TransformerHandler
  * listens for SAX ContentHandler parse events and transforms
  * them to a Result.
+ *
+ * @since 1.4
  */
 public interface TransformerHandler
     extends ContentHandler, LexicalHandler, DTDHandler {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/stream/StreamResult.java
--- a/jaxp/src/javax/xml/transform/stream/StreamResult.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/stream/StreamResult.java	Wed Jul 09 10:41:31 2014 -0700
@@ -37,6 +37,7 @@
  * which may be XML, plain Text, HTML, or some other form of markup.</p>
  *
  * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @since 1.4
  */
 public class StreamResult implements Result {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/transform/stream/StreamSource.java
--- a/jaxp/src/javax/xml/transform/stream/StreamSource.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/transform/stream/StreamSource.java	Wed Jul 09 10:41:31 2014 -0700
@@ -39,6 +39,7 @@
  * <code>StreamSource</code> instances may only be used once.</p>
  *
  * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @since 1.4
  */
 public class StreamSource implements Source {
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/validation/SchemaFactoryFinder.java
--- a/jaxp/src/javax/xml/validation/SchemaFactoryFinder.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/validation/SchemaFactoryFinder.java	Wed Jul 09 10:41:31 2014 -0700
@@ -40,7 +40,6 @@
  * Implementation of {@link SchemaFactory#newInstance(String)}.
  *
  * @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @version $Revision: 1.8 $, $Date: 2010-11-01 04:36:13 $
  * @since 1.5
  */
 class SchemaFactoryFinder  {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/xpath/XPathFactoryFinder.java
--- a/jaxp/src/javax/xml/xpath/XPathFactoryFinder.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/xpath/XPathFactoryFinder.java	Wed Jul 09 10:41:31 2014 -0700
@@ -40,7 +40,6 @@
  * Implementation of {@link XPathFactory#newInstance(String)}.
  *
  * @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @version $Revision: 1.7 $, $Date: 2010-11-01 04:36:14 $
  * @since 1.5
  */
 class XPathFactoryFinder  {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/javax/xml/xpath/package.html
--- a/jaxp/src/javax/xml/xpath/package.html	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/javax/xml/xpath/package.html	Wed Jul 09 10:41:31 2014 -0700
@@ -32,7 +32,6 @@
 <meta name="@author" content="mailto:Ben@galbraiths.org" />
 <meta name="@author" content="mailto:Norman.Walsh@Sun.com" />
 <meta name="@author" content="mailto:Jeff.Suttor@Sun.com" />
-<meta name="@version" content="$Revision: 1.3 $, $Date: 2005/11/03 19:34:17 $" />
 <meta name="@see" content="http://www.w3.org/TR/xpath" />
 <meta name="@since" content="1.5" />
 </head>
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/Attr.java
--- a/jaxp/src/org/w3c/dom/Attr.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/Attr.java	Wed Jul 09 10:41:31 2014 -0700
@@ -239,7 +239,7 @@
     /**
      * The <code>Element</code> node this attribute is attached to or
      * <code>null</code> if this attribute is not in use.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public Element getOwnerElement();
 
@@ -249,7 +249,7 @@
      * after loading the document or invoking
      * <code>Document.normalizeDocument()</code>, <code>schemaTypeInfo</code>
      *  may not be reliable if the node was moved.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public TypeInfo getSchemaTypeInfo();
 
@@ -297,7 +297,7 @@
      * reevaluated in accordance to the schema used. As a consequence, if
      * the <code>Attr.schemaTypeInfo</code> attribute contains an ID type,
      * <code>isId</code> will always return true.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public boolean isId();
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/DOMConfiguration.java
--- a/jaxp/src/org/w3c/dom/DOMConfiguration.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/DOMConfiguration.java	Wed Jul 09 10:41:31 2014 -0700
@@ -383,7 +383,7 @@
  * set, <code>Document.normalizeDocument()</code> will invoke the resource
  * resolver instead of using <code>Document.documentURI</code>.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
+ * @since 1.5, DOM Level 3
  */
 public interface DOMConfiguration {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/DOMError.java
--- a/jaxp/src/org/w3c/dom/DOMError.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/DOMError.java	Wed Jul 09 10:41:31 2014 -0700
@@ -44,7 +44,7 @@
 /**
  * <code>DOMError</code> is an interface that describes an error.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
+ * @since 1.5, DOM Level 3
  */
 public interface DOMError {
     // ErrorSeverity
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/DOMErrorHandler.java
--- a/jaxp/src/org/w3c/dom/DOMErrorHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/DOMErrorHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -53,7 +53,7 @@
  * <p> The application that is using the DOM implementation is expected to
  * implement this interface.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
+ * @since 1.5, DOM Level 3
  */
 public interface DOMErrorHandler {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/DOMException.java
--- a/jaxp/src/org/w3c/dom/DOMException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/DOMException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -116,29 +116,29 @@
     /**
      * If an attempt is made to use an object that is not, or is no longer,
      * usable.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public static final short INVALID_STATE_ERR         = 11;
     /**
      * If an invalid or illegal string is specified.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public static final short SYNTAX_ERR                = 12;
     /**
      * If an attempt is made to modify the type of the underlying object.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public static final short INVALID_MODIFICATION_ERR  = 13;
     /**
      * If an attempt is made to create or change an object in a way which is
      * incorrect with regard to namespaces.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public static final short NAMESPACE_ERR             = 14;
     /**
      * If a parameter or an operation is not supported by the underlying
      * object.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public static final short INVALID_ACCESS_ERR        = 15;
     /**
@@ -147,13 +147,13 @@
      * with respect to "partial validity", this exception would be raised
      * and the operation would not be done. This code is used in [<a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Val-20040127/'>DOM Level 3 Validation</a>]
      * . Refer to this specification for further information.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public static final short VALIDATION_ERR            = 16;
     /**
      *  If the type of an object is incompatible with the expected type of the
      * parameter associated to the object.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public static final short TYPE_MISMATCH_ERR         = 17;
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/DOMImplementation.java
--- a/jaxp/src/org/w3c/dom/DOMImplementation.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/DOMImplementation.java	Wed Jul 09 10:41:31 2014 -0700
@@ -77,7 +77,7 @@
      *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
      *   support the feature "XML" and the language exposed through the
      *   Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public DocumentType createDocumentType(String qualifiedName,
                                            String publicId,
@@ -129,7 +129,7 @@
      *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
      *   support the feature "XML" and the language exposed through the
      *   Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public Document createDocument(String namespaceURI,
                                    String qualifiedName,
@@ -157,7 +157,7 @@
      *   return results inconsistent with the primary core
      *   <code>DOMImplementation</code> such as <code>hasFeature</code>,
      *   <code>getFeature</code>, etc.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public Object getFeature(String feature,
                              String version);
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/DOMImplementationList.java
--- a/jaxp/src/org/w3c/dom/DOMImplementationList.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/DOMImplementationList.java	Wed Jul 09 10:41:31 2014 -0700
@@ -48,7 +48,7 @@
  * <code>DOMImplementationList</code> are accessible via an integral index,
  * starting from 0.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
+ * @since 1.5, DOM Level 3
  */
 public interface DOMImplementationList {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/DOMImplementationSource.java
--- a/jaxp/src/org/w3c/dom/DOMImplementationSource.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/DOMImplementationSource.java	Wed Jul 09 10:41:31 2014 -0700
@@ -49,7 +49,7 @@
  * listed in the binding-specific list of available sources so that its
  * <code>DOMImplementation</code> objects are made available.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
+ * @since 1.5, DOM Level 3
  */
 public interface DOMImplementationSource {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/DOMLocator.java
--- a/jaxp/src/org/w3c/dom/DOMLocator.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/DOMLocator.java	Wed Jul 09 10:41:31 2014 -0700
@@ -45,7 +45,7 @@
  * <code>DOMLocator</code> is an interface that describes a location (e.g.
  * where an error occurred).
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
+ * @since 1.5, DOM Level 3
  */
 public interface DOMLocator {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/DOMStringList.java
--- a/jaxp/src/org/w3c/dom/DOMStringList.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/DOMStringList.java	Wed Jul 09 10:41:31 2014 -0700
@@ -48,7 +48,7 @@
  * <code>DOMStringList</code> are accessible via an integral index, starting
  * from 0.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
+ * @since 1.5, DOM Level 3
  */
 public interface DOMStringList {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/Document.java
--- a/jaxp/src/org/w3c/dom/Document.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/Document.java	Wed Jul 09 10:41:31 2014 -0700
@@ -73,7 +73,7 @@
      * changing it afterwards is very unlikely to result in a change of the
      * features supported.
      *
-     * @since DOM Level 3
+     * @since 1.4, DOM Level 3
      */
     public DocumentType getDoctype();
 
@@ -337,7 +337,7 @@
      *   <code>Document.xmlVersion</code> attribute. This may happen when
      *   importing an XML 1.1 [<a href='http://www.w3.org/TR/2004/REC-xml11-20040204/'>XML 1.1</a>] element
      *   into an XML 1.0 document, for instance.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public Node importNode(Node importedNode,
                            boolean deep)
@@ -401,7 +401,7 @@
      *   <br>NOT_SUPPORTED_ERR: Always thrown if the current document does not
      *   support the <code>"XML"</code> feature, since namespaces were
      *   defined by XML.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public Element createElementNS(String namespaceURI,
                                    String qualifiedName)
@@ -470,7 +470,7 @@
      *   <br>NOT_SUPPORTED_ERR: Always thrown if the current document does not
      *   support the <code>"XML"</code> feature, since namespaces were
      *   defined by XML.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public Attr createAttributeNS(String namespaceURI,
                                   String qualifiedName)
@@ -485,7 +485,7 @@
      *   special value "*" matches all local names.
      * @return A new <code>NodeList</code> object containing all the matched
      *   <code>Elements</code>.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public NodeList getElementsByTagNameNS(String namespaceURI,
                                            String localName);
@@ -501,7 +501,7 @@
      * ID unless so defined.
      * @param elementId The unique <code>id</code> value for an element.
      * @return The matching element or <code>null</code> if there is none.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public Element getElementById(String elementId);
 
@@ -509,7 +509,7 @@
      * An attribute specifying the encoding used for this document at the time
      * of the parsing. This is <code>null</code> when it is not known, such
      * as when the <code>Document</code> was created in memory.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public String getInputEncoding();
 
@@ -517,7 +517,7 @@
      * An attribute specifying, as part of the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#NT-XMLDecl'>XML declaration</a>, the encoding of this document. This is <code>null</code> when
      * unspecified or when it is not known, such as when the
      * <code>Document</code> was created in memory.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public String getXmlEncoding();
 
@@ -529,7 +529,7 @@
      * <code>Document.normalizeDocument()</code> with the "validate"
      * parameter to verify if the value matches the <a href='http://www.w3.org/TR/2004/REC-xml-20040204#sec-rmd'>validity
      * constraint for standalone document declaration</a> as defined in [<a href='http://www.w3.org/TR/2004/REC-xml-20040204'>XML 1.0</a>].
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public boolean getXmlStandalone();
     /**
@@ -543,7 +543,7 @@
      * @exception DOMException
      *    NOT_SUPPORTED_ERR: Raised if this document does not support the
      *   "XML" feature.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public void setXmlStandalone(boolean xmlStandalone)
                                   throws DOMException;
@@ -570,7 +570,7 @@
      *  objects supporting a version of the "XMLVersion" feature must not
      * raise a <code>NOT_SUPPORTED_ERR</code> exception for the same version
      * number when using <code>Document.xmlVersion</code>.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public String getXmlVersion();
     /**
@@ -599,7 +599,7 @@
      *    NOT_SUPPORTED_ERR: Raised if the version is set to a value that is
      *   not supported by this <code>Document</code> or if this document
      *   does not support the "XML" feature.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public void setXmlVersion(String xmlVersion)
                                   throws DOMException;
@@ -612,7 +612,7 @@
      * errors while using <code>Document.normalizeDocument()</code>. In case
      * of error, the behavior is undefined. This attribute is
      * <code>true</code> by default.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public boolean getStrictErrorChecking();
     /**
@@ -623,7 +623,7 @@
      * errors while using <code>Document.normalizeDocument()</code>. In case
      * of error, the behavior is undefined. This attribute is
      * <code>true</code> by default.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public void setStrictErrorChecking(boolean strictErrorChecking);
 
@@ -638,7 +638,7 @@
      * "HTML" [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
      * , the href attribute of the HTML BASE element takes precedence over
      * this attribute when computing <code>Node.baseURI</code>.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public String getDocumentURI();
     /**
@@ -652,7 +652,7 @@
      * "HTML" [<a href='http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109'>DOM Level 2 HTML</a>]
      * , the href attribute of the HTML BASE element takes precedence over
      * this attribute when computing <code>Node.baseURI</code>.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public void setDocumentURI(String documentURI);
 
@@ -723,7 +723,7 @@
      *   <code>DOCUMENT</code>, <code>DOCUMENT_TYPE</code>.
      *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised when the source node is
      *   readonly.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public Node adoptNode(Node source)
                           throws DOMException;
@@ -731,7 +731,7 @@
     /**
      *  The configuration used when <code>Document.normalizeDocument()</code>
      * is invoked.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public DOMConfiguration getDomConfig();
 
@@ -765,7 +765,7 @@
      * " parameter. Note this method might also report fatal errors (
      * <code>DOMError.SEVERITY_FATAL_ERROR</code>) if an implementation
      * cannot recover from an error.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public void normalizeDocument();
 
@@ -834,7 +834,7 @@
      *   . Also raised, when the node being renamed is an attribute, if the
      *   <code>qualifiedName</code>, or its prefix, is "xmlns" and the
      *   <code>namespaceURI</code> is different from "<a href='http://www.w3.org/2000/xmlns/'>http://www.w3.org/2000/xmlns/</a>".
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public Node renameNode(Node n,
                            String namespaceURI,
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/DocumentType.java
--- a/jaxp/src/org/w3c/dom/DocumentType.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/DocumentType.java	Wed Jul 09 10:41:31 2014 -0700
@@ -87,14 +87,14 @@
 
     /**
      * The public identifier of the external subset.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public String getPublicId();
 
     /**
      * The system identifier of the external subset. This may be an absolute
      * URI or not.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public String getSystemId();
 
@@ -105,7 +105,7 @@
      * information is available to the implementation. This may vary
      * depending on various parameters, including the XML processor used to
      * build the document.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public String getInternalSubset();
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/Element.java
--- a/jaxp/src/org/w3c/dom/Element.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/Element.java	Wed Jul 09 10:41:31 2014 -0700
@@ -203,7 +203,7 @@
      *   NOT_SUPPORTED_ERR: May be raised if the implementation does not
      *   support the feature <code>"XML"</code> and the language exposed
      *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public String getAttributeNS(String namespaceURI,
                                  String localName)
@@ -249,7 +249,7 @@
      *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
      *   support the feature <code>"XML"</code> and the language exposed
      *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public void setAttributeNS(String namespaceURI,
                                String qualifiedName,
@@ -278,7 +278,7 @@
      *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
      *   support the feature <code>"XML"</code> and the language exposed
      *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public void removeAttributeNS(String namespaceURI,
                                   String localName)
@@ -299,7 +299,7 @@
      *   NOT_SUPPORTED_ERR: May be raised if the implementation does not
      *   support the feature <code>"XML"</code> and the language exposed
      *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public Attr getAttributeNodeNS(String namespaceURI,
                                    String localName)
@@ -329,7 +329,7 @@
      *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
      *   support the feature <code>"XML"</code> and the language exposed
      *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public Attr setAttributeNodeNS(Attr newAttr)
                                    throws DOMException;
@@ -348,7 +348,7 @@
      *   NOT_SUPPORTED_ERR: May be raised if the implementation does not
      *   support the feature <code>"XML"</code> and the language exposed
      *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public NodeList getElementsByTagNameNS(String namespaceURI,
                                            String localName)
@@ -362,7 +362,7 @@
      * @return <code>true</code> if an attribute with the given name is
      *   specified on this element or has a default value, <code>false</code>
      *    otherwise.
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public boolean hasAttribute(String name);
 
@@ -383,7 +383,7 @@
      *   NOT_SUPPORTED_ERR: May be raised if the implementation does not
      *   support the feature <code>"XML"</code> and the language exposed
      *   through the Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public boolean hasAttributeNS(String namespaceURI,
                                   String localName)
@@ -391,7 +391,7 @@
 
     /**
      *  The type information associated with this element.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public TypeInfo getSchemaTypeInfo();
 
@@ -413,7 +413,7 @@
      *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
      *   <br>NOT_FOUND_ERR: Raised if the specified node is not an attribute
      *   of this element.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public void setIdAttribute(String name,
                                boolean isId)
@@ -436,7 +436,7 @@
      *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
      *   <br>NOT_FOUND_ERR: Raised if the specified node is not an attribute
      *   of this element.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public void setIdAttributeNS(String namespaceURI,
                                  String localName,
@@ -459,7 +459,7 @@
      *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
      *   <br>NOT_FOUND_ERR: Raised if the specified node is not an attribute
      *   of this element.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public void setIdAttributeNode(Attr idAttr,
                                    boolean isId)
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/Entity.java
--- a/jaxp/src/org/w3c/dom/Entity.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/Entity.java	Wed Jul 09 10:41:31 2014 -0700
@@ -96,7 +96,7 @@
      * of parsing, when it is an external parsed entity. This is
      * <code>null</code> if it an entity from the internal subset or if it
      * is not known.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public String getInputEncoding();
 
@@ -104,7 +104,7 @@
      * An attribute specifying, as part of the text declaration, the encoding
      * of this entity, when it is an external parsed entity. This is
      * <code>null</code> otherwise.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public String getXmlEncoding();
 
@@ -112,7 +112,7 @@
      * An attribute specifying, as part of the text declaration, the version
      * number of this entity, when it is an external parsed entity. This is
      * <code>null</code> otherwise.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public String getXmlVersion();
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/NameList.java
--- a/jaxp/src/org/w3c/dom/NameList.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/NameList.java	Wed Jul 09 10:41:31 2014 -0700
@@ -48,7 +48,7 @@
  * implemented. The items in the <code>NameList</code> are accessible via an
  * integral index, starting from 0.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
+ * @since 1.5, DOM Level 3
  */
 public interface NameList {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/NamedNodeMap.java
--- a/jaxp/src/org/w3c/dom/NamedNodeMap.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/NamedNodeMap.java	Wed Jul 09 10:41:31 2014 -0700
@@ -141,7 +141,7 @@
      *   NOT_SUPPORTED_ERR: May be raised if the implementation does not
      *   support the feature "XML" and the language exposed through the
      *   Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public Node getNamedItemNS(String namespaceURI,
                                String localName)
@@ -177,7 +177,7 @@
      *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
      *   support the feature "XML" and the language exposed through the
      *   Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public Node setNamedItemNS(Node arg)
                                throws DOMException;
@@ -203,7 +203,7 @@
      *   <br>NOT_SUPPORTED_ERR: May be raised if the implementation does not
      *   support the feature "XML" and the language exposed through the
      *   Document does not support XML Namespaces (such as [<a href='http://www.w3.org/TR/1999/REC-html401-19991224/'>HTML 4.01</a>]).
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public Node removeNamedItemNS(String namespaceURI,
                                   String localName)
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/Node.java
--- a/jaxp/src/org/w3c/dom/Node.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/Node.java	Wed Jul 09 10:41:31 2014 -0700
@@ -299,7 +299,7 @@
      * which is not used with any <code>Document</code> yet, this is
      * <code>null</code>.
      *
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public Document getOwnerDocument();
 
@@ -335,7 +335,7 @@
      *   support the insertion of a <code>DocumentType</code> or
      *   <code>Element</code> node.
      *
-     * @since DOM Level 3
+     * @since 1.4, DOM Level 3
      */
     public Node insertBefore(Node newChild,
                              Node refChild)
@@ -373,7 +373,7 @@
      *   support the replacement of the <code>DocumentType</code> child or
      *   <code>Element</code> child.
      *
-     * @since DOM Level 3
+     * @since 1.4, DOM Level 3
      */
     public Node replaceChild(Node newChild,
                              Node oldChild)
@@ -393,7 +393,7 @@
      *   support the removal of the <code>DocumentType</code> child or the
      *   <code>Element</code> child.
      *
-     * @since DOM Level 3
+     * @since 1.4, DOM Level 3
      */
     public Node removeChild(Node oldChild)
                             throws DOMException;
@@ -422,7 +422,7 @@
      *   if the DOM implementation doesn't support the removal of the
      *   <code>DocumentType</code> child or <code>Element</code> child.
      *
-     * @since DOM Level 3
+     * @since 1.4, DOM Level 3
      */
     public Node appendChild(Node newChild)
                             throws DOMException;
@@ -491,7 +491,7 @@
      * sufficient, since XPointers do not differentiate between
      * <code>Text</code> nodes and <code>CDATASection</code> nodes.
      *
-     * @since DOM Level 3
+     * @since 1.4, DOM Level 3
      */
     public void normalize();
 
@@ -503,7 +503,7 @@
      * @return Returns <code>true</code> if the specified feature is
      *   supported on this node, <code>false</code> otherwise.
      *
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public boolean isSupported(String feature,
                                String version);
@@ -523,7 +523,7 @@
      * attached to. If an attribute is not explicitly given a namespace, it
      * simply has no namespace.
      *
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public String getNamespaceURI();
 
@@ -547,7 +547,7 @@
      * method, such as <code>createElement</code> from the
      * <code>Document</code> interface, this is always <code>null</code>.
      *
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public String getPrefix();
     /**
@@ -584,7 +584,7 @@
      *   this node is "xmlns" [<a href='http://www.w3.org/TR/1999/REC-xml-names-19990114/'>XML Namespaces</a>]
      *   .
      *
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public void setPrefix(String prefix)
                                throws DOMException;
@@ -596,7 +596,7 @@
      * method, such as <code>Document.createElement()</code>, this is always
      * <code>null</code>.
      *
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public String getLocalName();
 
@@ -605,7 +605,7 @@
      * @return Returns <code>true</code> if this node has any attributes,
      *   <code>false</code> otherwise.
      *
-     * @since DOM Level 2
+     * @since 1.4, DOM Level 2
      */
     public boolean hasAttributes();
 
@@ -619,7 +619,7 @@
      * <code>documentURI</code> attribute from the <code>Document</code>
      * interface otherwise.
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public String getBaseURI();
 
@@ -666,7 +666,7 @@
      *   implementations that do not coordinate to return consistent
      *   implementation-specific results.
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public short compareDocumentPosition(Node other)
                                          throws DOMException;
@@ -717,7 +717,7 @@
      *   fit in a <code>DOMString</code> variable on the implementation
      *   platform.
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public String getTextContent()
                                          throws DOMException;
@@ -765,7 +765,7 @@
      * @exception DOMException
      *   NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public void setTextContent(String textContent)
                                          throws DOMException;
@@ -783,7 +783,7 @@
      * @return Returns <code>true</code> if the nodes are the same,
      *   <code>false</code> otherwise.
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public boolean isSameNode(Node other);
 
@@ -798,7 +798,7 @@
      *   associated to the namespace prefix, the returned namespace prefix
      *   is implementation dependent.
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public String lookupPrefix(String namespaceURI);
 
@@ -810,7 +810,7 @@
      *   <code>namespaceURI</code> is the default namespace,
      *   <code>false</code> otherwise.
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public boolean isDefaultNamespace(String namespaceURI);
 
@@ -824,7 +824,7 @@
      * @return Returns the associated namespace URI or <code>null</code> if
      *   none is found.
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public String lookupNamespaceURI(String prefix);
 
@@ -890,7 +890,7 @@
      * @return Returns <code>true</code> if the nodes are equal,
      *   <code>false</code> otherwise.
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public boolean isEqualNode(Node arg);
 
@@ -915,7 +915,7 @@
      *   with the primary core <code>Node</code> such as attributes,
      *   childNodes, etc.
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public Object getFeature(String feature,
                              String version);
@@ -932,7 +932,7 @@
      * @return Returns the <code>DOMUserData</code> previously associated to
      *   the given key on this node, or <code>null</code> if there was none.
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public Object setUserData(String key,
                               Object data,
@@ -946,7 +946,7 @@
      * @return Returns the <code>DOMUserData</code> associated to the given
      *   key on this node, or <code>null</code> if there was none.
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public Object getUserData(String key);
 
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/Text.java
--- a/jaxp/src/org/w3c/dom/Text.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/Text.java	Wed Jul 09 10:41:31 2014 -0700
@@ -93,7 +93,7 @@
      * determined to contain whitespace in element content during the load
      * of the document or if validation occurs while using
      * <code>Document.normalizeDocument()</code>.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public boolean isElementContentWhitespace();
 
@@ -121,7 +121,7 @@
      * </pre>
      * <em>Figure: barTextNode.wholeText value is "barfoo"</em>
      *
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public String getWholeText();
 
@@ -179,7 +179,7 @@
      * @exception DOMException
      *   NO_MODIFICATION_ALLOWED_ERR: Raised if one of the <code>Text</code>
      *   nodes being replaced is readonly.
-     * @since DOM Level 3
+     * @since 1.5, DOM Level 3
      */
     public Text replaceWholeText(String content)
                                  throws DOMException;
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/TypeInfo.java
--- a/jaxp/src/org/w3c/dom/TypeInfo.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/TypeInfo.java	Wed Jul 09 10:41:31 2014 -0700
@@ -118,7 +118,7 @@
  * and therefore should define how to represent their type systems using
  * <code>TypeInfo</code>.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
+ * @since 1.5, DOM Level 3
  */
 public interface TypeInfo {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/UserDataHandler.java
--- a/jaxp/src/org/w3c/dom/UserDataHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/UserDataHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -49,7 +49,7 @@
  * implement various behaviors regarding the data it associates to the DOM
  * nodes. This interface defines that handler.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407'>Document Object Model (DOM) Level 3 Core Specification</a>.
- * @since DOM Level 3
+ * @since 1.5, DOM Level 3
  */
 public interface UserDataHandler {
     // OperationType
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java
--- a/jaxp/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java	Wed Jul 09 10:41:31 2014 -0700
@@ -79,7 +79,7 @@
  *
  * @see DOMImplementation
  * @see DOMImplementationSource
- * @since DOM Level 3
+ * @since 1.5, DOM Level 3
  */
 public final class DOMImplementationRegistry {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/events/DocumentEvent.java
--- a/jaxp/src/org/w3c/dom/events/DocumentEvent.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/events/DocumentEvent.java	Wed Jul 09 10:41:31 2014 -0700
@@ -50,7 +50,7 @@
  * implemented on the same object which implements the <code>Document</code>
  * interface in an implementation which supports the Event model.
  * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
+ * @since 1.5, DOM Level 2
  */
 public interface DocumentEvent {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/events/Event.java
--- a/jaxp/src/org/w3c/dom/events/Event.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/events/Event.java	Wed Jul 09 10:41:31 2014 -0700
@@ -51,7 +51,7 @@
  * type of event they accompany. These derived interfaces are also
  * implemented by the object passed to the event listener.
  * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
+ * @since 1.5, DOM Level 2
  */
 public interface Event {
     // PhaseType
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/events/EventException.java
--- a/jaxp/src/org/w3c/dom/events/EventException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/events/EventException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -45,7 +45,7 @@
  *  Event operations may throw an <code>EventException</code> as specified in
  * their method descriptions.
  * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
+ * @since 1.5, DOM Level 2
  */
 public class EventException extends RuntimeException {
     public EventException(short code, String message) {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/events/EventListener.java
--- a/jaxp/src/org/w3c/dom/events/EventListener.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/events/EventListener.java	Wed Jul 09 10:41:31 2014 -0700
@@ -54,7 +54,7 @@
  * the user wishes the same <code>EventListener</code>s to be added to the
  * newly created copy the user must add them manually.
  * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
+ * @since 1.5, DOM Level 2
  */
 public interface EventListener {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/events/EventTarget.java
--- a/jaxp/src/org/w3c/dom/events/EventTarget.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/events/EventTarget.java	Wed Jul 09 10:41:31 2014 -0700
@@ -50,7 +50,7 @@
  * <code>EventListeners</code> on an <code>EventTarget</code> and dispatch
  * of events to that <code>EventTarget</code>.
  * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
+ * @since 1.5, DOM Level 2
  */
 public interface EventTarget {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/events/MouseEvent.java
--- a/jaxp/src/org/w3c/dom/events/MouseEvent.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/events/MouseEvent.java	Wed Jul 09 10:41:31 2014 -0700
@@ -58,7 +58,7 @@
  * bubbling to obtain notification of mouse events which occur within its
  * descendent elements.
  * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
+ * @since 1.5, DOM Level 2
  */
 public interface MouseEvent extends UIEvent {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/events/MutationEvent.java
--- a/jaxp/src/org/w3c/dom/events/MutationEvent.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/events/MutationEvent.java	Wed Jul 09 10:41:31 2014 -0700
@@ -47,7 +47,7 @@
  * The <code>MutationEvent</code> interface provides specific contextual
  * information associated with Mutation events.
  * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
+ * @since 1.5, DOM Level 2
  */
 public interface MutationEvent extends Event {
     // attrChangeType
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/events/UIEvent.java
--- a/jaxp/src/org/w3c/dom/events/UIEvent.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/events/UIEvent.java	Wed Jul 09 10:41:31 2014 -0700
@@ -47,7 +47,7 @@
  * The <code>UIEvent</code> interface provides specific contextual information
  * associated with User Interface events.
  * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
+ * @since 1.5, DOM Level 2
  */
 public interface UIEvent extends Event {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/ls/DOMImplementationLS.java
--- a/jaxp/src/org/w3c/dom/ls/DOMImplementationLS.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/ls/DOMImplementationLS.java	Wed Jul 09 10:41:31 2014 -0700
@@ -57,6 +57,8 @@
  * <code>"3.0"</code> (respectively).
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
 and Save Specification</a>.
+ *
+ * @since 1.5
  */
 public interface DOMImplementationLS {
     // DOMImplementationLSMode
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/ls/LSException.java
--- a/jaxp/src/org/w3c/dom/ls/LSException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/ls/LSException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -54,6 +54,8 @@
  * implementation dependent.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
 and Save Specification</a>.
+ *
+ * @since 1.5
  */
 public class LSException extends RuntimeException {
     public LSException(short code, String message) {
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/ls/LSInput.java
--- a/jaxp/src/org/w3c/dom/ls/LSInput.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/ls/LSInput.java	Wed Jul 09 10:41:31 2014 -0700
@@ -82,6 +82,8 @@
  * modify the copies, if necessary).
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
 and Save Specification</a>.
+ *
+ * @since 1.5
  */
 public interface LSInput {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/ls/LSLoadEvent.java
--- a/jaxp/src/org/w3c/dom/ls/LSLoadEvent.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/ls/LSLoadEvent.java	Wed Jul 09 10:41:31 2014 -0700
@@ -49,6 +49,8 @@
  * of a document load.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
 and Save Specification</a>.
+ *
+ * @since 1.5
  */
 public interface LSLoadEvent extends Event {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/ls/LSOutput.java
--- a/jaxp/src/org/w3c/dom/ls/LSOutput.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/ls/LSOutput.java	Wed Jul 09 10:41:31 2014 -0700
@@ -74,6 +74,8 @@
  * modify the copies, if necessary).
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
 and Save Specification</a>.
+ *
+ * @since 1.5
  */
 public interface LSOutput {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/ls/LSParser.java
--- a/jaxp/src/org/w3c/dom/ls/LSParser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/ls/LSParser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -166,6 +166,8 @@
  * permission denied,...), XML well-formedness errors, and so on.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
 and Save Specification</a>.
+ *
+ * @since 1.5
  */
 public interface LSParser {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/ls/LSParserFilter.java
--- a/jaxp/src/org/w3c/dom/ls/LSParserFilter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/ls/LSParserFilter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -73,6 +73,8 @@
  * throwing exceptions from a filter is DOM implementation dependent.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
 and Save Specification</a>.
+ *
+ * @since 1.5
  */
 public interface LSParserFilter {
     // Constants returned by startElement and acceptNode
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/ls/LSProgressEvent.java
--- a/jaxp/src/org/w3c/dom/ls/LSProgressEvent.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/ls/LSProgressEvent.java	Wed Jul 09 10:41:31 2014 -0700
@@ -53,6 +53,8 @@
  * input dependent.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
 and Save Specification</a>.
+ *
+ * @since 1.5
  */
 public interface LSProgressEvent extends Event {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/ls/LSResourceResolver.java
--- a/jaxp/src/org/w3c/dom/ls/LSResourceResolver.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/ls/LSResourceResolver.java	Wed Jul 09 10:41:31 2014 -0700
@@ -63,6 +63,8 @@
  * interface.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
 and Save Specification</a>.
+ *
+ * @since 1.5
  */
 public interface LSResourceResolver {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/ls/LSSerializer.java
--- a/jaxp/src/org/w3c/dom/ls/LSSerializer.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/ls/LSSerializer.java	Wed Jul 09 10:41:31 2014 -0700
@@ -204,6 +204,8 @@
  * permission denied,...) and so on.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
 and Save Specification</a>.
+ *
+ * @since 1.5
  */
 public interface LSSerializer {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/ls/LSSerializerFilter.java
--- a/jaxp/src/org/w3c/dom/ls/LSSerializerFilter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/ls/LSSerializerFilter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -70,6 +70,8 @@
  * document.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407'>Document Object Model (DOM) Level 3 Load
 and Save Specification</a>.
+ *
+ * @since 1.5
  */
 public interface LSSerializerFilter extends NodeFilter {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/package.html
--- a/jaxp/src/org/w3c/dom/package.html	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/package.html	Wed Jul 09 10:41:31 2014 -0700
@@ -3,13 +3,11 @@
 <title>org.w3c.dom package</title>
 </head>
 <body bgcolor="white">
-Provides the interfaces for the Document Object Model (DOM) which is a
-component API of the <a href="http://java.sun.com/xml">Java API for XML
-Processing</a>.  The Document Object Model Level 2 Core API allows programs
-to dynamically access and update the content and structure of documents.
-See the <a href="http://www.w3.org/TR/DOM-Level-2-Core/">specification</a>
-for more information.
+Provides the interfaces for the Document Object Model (DOM). Supports the
+<a href="http://www.w3.org/TR/DOM-Level-2-Core/">Document Object Model Level 2 Core APIi</a>, 
+<a href="http://www.w3.org/TR/DOM-Level-3-Core">Document Object Model (DOM) Level 3 Core</a>, 
+and <a href="http://www.w3.org/TR/DOM-Level-3-LS">Document Object Model (DOM) Level 3 Load and Save</a>.
 
-@since JDK1.4
+@since 1.4
 </body>
 </html>
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/views/AbstractView.java
--- a/jaxp/src/org/w3c/dom/views/AbstractView.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/views/AbstractView.java	Wed Jul 09 10:41:31 2014 -0700
@@ -44,7 +44,7 @@
 /**
  * A base interface that all views shall derive from.
  * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Views-20001113'>Document Object Model (DOM) Level 2 Views Specification</a>.
- * @since DOM Level 2
+ * @since 1.8, DOM Level 2
  */
 public interface AbstractView {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/w3c/dom/views/DocumentView.java
--- a/jaxp/src/org/w3c/dom/views/DocumentView.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/w3c/dom/views/DocumentView.java	Wed Jul 09 10:41:31 2014 -0700
@@ -47,7 +47,7 @@
  * Views. It provides an attribute to retrieve the default view of a
  * document.
  * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Views-20001113'>Document Object Model (DOM) Level 2 Views Specification</a>.
- * @since DOM Level 2
+ * @since 1.8, DOM Level 2
  */
 public interface DocumentView {
     /**
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/AttributeList.java
--- a/jaxp/src/org/xml/sax/AttributeList.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/AttributeList.java	Wed Jul 09 10:41:31 2014 -0700
@@ -88,7 +88,7 @@
  * @deprecated This interface has been replaced by the SAX2
  *             {@link org.xml.sax.Attributes Attributes}
  *             interface, which includes Namespace support.
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @see org.xml.sax.DocumentHandler#startElement startElement
  * @see org.xml.sax.helpers.AttributeListImpl AttributeListImpl
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/Attributes.java
--- a/jaxp/src/org/xml/sax/Attributes.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/Attributes.java	Wed Jul 09 10:41:31 2014 -0700
@@ -85,7 +85,7 @@
  * <p>The order of attributes in the list is unspecified, and will
  * vary from implementation to implementation.</p>
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson
  * @see org.xml.sax.helpers.AttributesImpl
  * @see org.xml.sax.ext.DeclHandler#attributeDecl
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/ContentHandler.java
--- a/jaxp/src/org/xml/sax/ContentHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/ContentHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -73,7 +73,7 @@
  * anyway, so the user should consider this a feature rather than a
  * bug.</p>
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson
  * @see org.xml.sax.XMLReader
  * @see org.xml.sax.DTDHandler
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/DTDHandler.java
--- a/jaxp/src/org/xml/sax/DTDHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/DTDHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -67,7 +67,7 @@
  * obtained through this interface to find the entity and/or
  * notation corresponding with the attribute value.</p>
  *
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @see org.xml.sax.XMLReader#setDTDHandler
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/DocumentHandler.java
--- a/jaxp/src/org/xml/sax/DocumentHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/DocumentHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -62,7 +62,7 @@
  * @deprecated This interface has been replaced by the SAX2
  *             {@link org.xml.sax.ContentHandler ContentHandler}
  *             interface, which includes Namespace support.
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @see org.xml.sax.Parser#setDocumentHandler
  * @see org.xml.sax.Locator
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/EntityResolver.java
--- a/jaxp/src/org/xml/sax/EntityResolver.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/EntityResolver.java	Wed Jul 09 10:41:31 2014 -0700
@@ -85,7 +85,7 @@
  * identifiers to local URIs or to look up replacements in a catalog
  * (possibly by using the public identifier).</p>
  *
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @see org.xml.sax.XMLReader#setEntityResolver
  * @see org.xml.sax.InputSource
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/ErrorHandler.java
--- a/jaxp/src/org/xml/sax/ErrorHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/ErrorHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -65,7 +65,7 @@
  * For example, {@link XMLReader#parse XMLReader.parse()} would throw
  * an IOException for errors accessing entities or the document.</p>
  *
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @see org.xml.sax.XMLReader#setErrorHandler
  * @see org.xml.sax.SAXParseException
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/HandlerBase.java
--- a/jaxp/src/org/xml/sax/HandlerBase.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/HandlerBase.java	Wed Jul 09 10:41:31 2014 -0700
@@ -59,7 +59,7 @@
  *             interface.  It has been replaced by the SAX2
  *             {@link org.xml.sax.helpers.DefaultHandler DefaultHandler}
  *             class.
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @see org.xml.sax.EntityResolver
  * @see org.xml.sax.DTDHandler
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/InputSource.java
--- a/jaxp/src/org/xml/sax/InputSource.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/InputSource.java	Wed Jul 09 10:41:31 2014 -0700
@@ -74,7 +74,7 @@
  * so applications should not attempt to re-use such streams after they
  * have been handed to a parser.  </p>
  *
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @see org.xml.sax.XMLReader#parse(org.xml.sax.InputSource)
  * @see org.xml.sax.EntityResolver#resolveEntity
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/Locator.java
--- a/jaxp/src/org/xml/sax/Locator.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/Locator.java	Wed Jul 09 10:41:31 2014 -0700
@@ -62,7 +62,7 @@
  * event, the application should assume that a locator is not
  * available.</p>
  *
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @see org.xml.sax.ContentHandler#setDocumentLocator
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/Parser.java
--- a/jaxp/src/org/xml/sax/Parser.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/Parser.java	Wed Jul 09 10:41:31 2014 -0700
@@ -64,7 +64,7 @@
  * @deprecated This interface has been replaced by the SAX2
  *             {@link org.xml.sax.XMLReader XMLReader}
  *             interface, which includes Namespace support.
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @see org.xml.sax.EntityResolver
  * @see org.xml.sax.DTDHandler
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/SAXException.java
--- a/jaxp/src/org/xml/sax/SAXException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/SAXException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -54,7 +54,7 @@
  * specific location in an XML document, it should use the
  * {@link org.xml.sax.SAXParseException SAXParseException} subclass.</p>
  *
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @version 2.0.1 (sax2r2)
  * @see org.xml.sax.SAXParseException
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/SAXNotRecognizedException.java
--- a/jaxp/src/org/xml/sax/SAXNotRecognizedException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/SAXNotRecognizedException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -46,7 +46,7 @@
  * unrecognized feature or property identifier; SAX applications and
  * extensions may use this class for other, similar purposes.</p>
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson
  * @see org.xml.sax.SAXNotSupportedException
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/SAXNotSupportedException.java
--- a/jaxp/src/org/xml/sax/SAXNotSupportedException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/SAXNotSupportedException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -46,7 +46,7 @@
  * operation (setting a state or value).  Other SAX2 applications and
  * extensions may use this class for similar purposes.</p>
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson
  * @see org.xml.sax.SAXNotRecognizedException
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/SAXParseException.java
--- a/jaxp/src/org/xml/sax/SAXParseException.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/SAXParseException.java	Wed Jul 09 10:41:31 2014 -0700
@@ -52,7 +52,7 @@
  * <p>Since this exception is a subclass of {@link org.xml.sax.SAXException
  * SAXException}, it inherits the ability to wrap another exception.</p>
  *
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @version 2.0.1 (sax2r2)
  * @see org.xml.sax.SAXException
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/XMLFilter.java
--- a/jaxp/src/org/xml/sax/XMLFilter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/XMLFilter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -53,7 +53,7 @@
  * {@link org.xml.sax.ContentHandler ContentHandler} and {@link org.xml.sax.ErrorHandler
  * ErrorHandler} events automatically.</p>
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson
  * @see org.xml.sax.helpers.XMLFilterImpl
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/XMLReader.java
--- a/jaxp/src/org/xml/sax/XMLReader.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/XMLReader.java	Wed Jul 09 10:41:31 2014 -0700
@@ -75,7 +75,7 @@
  * <p>There are adapters available to convert a SAX1 Parser to
  * a SAX2 XMLReader and vice-versa.</p>
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson
  * @see org.xml.sax.XMLFilter
  * @see org.xml.sax.helpers.ParserAdapter
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/ext/Attributes2.java
--- a/jaxp/src/org/xml/sax/ext/Attributes2.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/ext/Attributes2.java	Wed Jul 09 10:41:31 2014 -0700
@@ -57,7 +57,7 @@
  * must have been declared.
  * </p>
  *
- * @since SAX 2.0 (extensions 1.1 alpha)
+ * @since 1.5, SAX 2.0 (extensions 1.1 alpha)
  * @author David Brownell
  */
 public interface Attributes2 extends Attributes
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/ext/Attributes2Impl.java
--- a/jaxp/src/org/xml/sax/ext/Attributes2Impl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/ext/Attributes2Impl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -56,7 +56,7 @@
  * its <em>declared</em> flag to match.
  * </p>
  *
- * @since SAX 2.0 (extensions 1.1 alpha)
+ * @since 1.5, SAX 2.0 (extensions 1.1 alpha)
  * @author David Brownell
  */
 public class Attributes2Impl extends AttributesImpl implements Attributes2
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/ext/DeclHandler.java
--- a/jaxp/src/org/xml/sax/ext/DeclHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/ext/DeclHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -66,7 +66,7 @@
  * {@link org.xml.sax.SAXNotRecognizedException SAXNotRecognizedException}
  * when you attempt to register the handler.</p>
  *
- * @since SAX 2.0 (extensions 1.0)
+ * @since 1.4, SAX 2.0 (extensions 1.0)
  * @author David Megginson
  */
 public interface DeclHandler
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/ext/DefaultHandler2.java
--- a/jaxp/src/org/xml/sax/ext/DefaultHandler2.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/ext/DefaultHandler2.java	Wed Jul 09 10:41:31 2014 -0700
@@ -55,7 +55,7 @@
  * <em>ContentHandler.startElement()</em> call might be passed a
  * {@link Attributes2} object.
  *
- * @since SAX 2.0 (extensions 1.1 alpha)
+ * @since 1.5, SAX 2.0 (extensions 1.1 alpha)
  * @author David Brownell
  */
 public class DefaultHandler2 extends DefaultHandler
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/ext/EntityResolver2.java
--- a/jaxp/src/org/xml/sax/ext/EntityResolver2.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/ext/EntityResolver2.java	Wed Jul 09 10:41:31 2014 -0700
@@ -80,7 +80,7 @@
  *
  * @see org.xml.sax.XMLReader#setEntityResolver
  *
- * @since SAX 2.0 (extensions 1.1 alpha)
+ * @since 1.5, SAX 2.0 (extensions 1.1 alpha)
  * @author David Brownell
  */
 public interface EntityResolver2 extends EntityResolver
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/ext/LexicalHandler.java
--- a/jaxp/src/org/xml/sax/ext/LexicalHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/ext/LexicalHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -62,7 +62,7 @@
  * {@link org.xml.sax.SAXNotRecognizedException SAXNotRecognizedException}
  * when you attempt to register the handler.</p>
  *
- * @since SAX 2.0 (extensions 1.0)
+ * @since 1.4, SAX 2.0 (extensions 1.0)
  * @author David Megginson
  */
 public interface LexicalHandler
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/ext/Locator2.java
--- a/jaxp/src/org/xml/sax/ext/Locator2.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/ext/Locator2.java	Wed Jul 09 10:41:31 2014 -0700
@@ -51,7 +51,7 @@
  * <p> XMLReader implementations are not required to support this
  * information, and it is not part of core-only SAX2 distributions.</p>
  *
- * @since SAX 2.0 (extensions 1.1 alpha)
+ * @since 1.5, SAX 2.0 (extensions 1.1 alpha)
  * @author David Brownell
  */
 public interface Locator2 extends Locator
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/ext/Locator2Impl.java
--- a/jaxp/src/org/xml/sax/ext/Locator2Impl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/ext/Locator2Impl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -45,7 +45,7 @@
  *
  * <p> This is not part of core-only SAX2 distributions.</p>
  *
- * @since SAX 2.0.2
+ * @since 1.5, SAX 2.0.2
  * @author David Brownell
  */
 public class Locator2Impl extends LocatorImpl implements Locator2
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/helpers/AttributeListImpl.java
--- a/jaxp/src/org/xml/sax/helpers/AttributeListImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/helpers/AttributeListImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -82,7 +82,7 @@
  *             which is implemented in the
  *             {@link org.xml.sax.helpers.AttributesImpl
  *            AttributesImpl} helper class.
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @see org.xml.sax.AttributeList
  * @see org.xml.sax.DocumentHandler#startElement
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/helpers/AttributesImpl.java
--- a/jaxp/src/org/xml/sax/helpers/AttributesImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/helpers/AttributesImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -64,7 +64,7 @@
  * AttributeList} interface, it also includes a much more efficient
  * implementation using a single array rather than a set of Vectors.</p>
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson
  */
 public class AttributesImpl implements Attributes
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/helpers/DefaultHandler.java
--- a/jaxp/src/org/xml/sax/helpers/DefaultHandler.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/helpers/DefaultHandler.java	Wed Jul 09 10:41:31 2014 -0700
@@ -73,7 +73,7 @@
  * <p>This class replaces the deprecated SAX1
  * {@link org.xml.sax.HandlerBase HandlerBase} class.</p>
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson,
  * @see org.xml.sax.EntityResolver
  * @see org.xml.sax.DTDHandler
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/helpers/LocatorImpl.java
--- a/jaxp/src/org/xml/sax/helpers/LocatorImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/helpers/LocatorImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -69,7 +69,7 @@
  * is more efficient to provide location information only when
  * requested, rather than constantly updating a Locator object.</p>
  *
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @see org.xml.sax.Locator Locator
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/helpers/NamespaceSupport.java
--- a/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java	Wed Jul 09 10:41:31 2014 -0700
@@ -90,7 +90,7 @@
  * Applications must track namespace information themselves if they
  * want to use namespace information.
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson
  */
 public class NamespaceSupport
@@ -126,7 +126,7 @@
      * <em>xmlns</em> and <em>xmlns:*</em> attributes, which are used to
      * declare namespaces.  </p>
      *
-     * @since SAX 2.1alpha
+     * @since 1.5, SAX 2.1alpha
      * @see #setNamespaceDeclUris
      * @see #isNamespaceDeclUris
      */
@@ -497,7 +497,7 @@
      * by {@link #processName processName()}.  This may only be
      * changed before any contexts have been pushed.
      *
-     * @since SAX 2.1alpha
+     * @since 1.5, SAX 2.1alpha
      *
      * @exception IllegalStateException when attempting to set this
      *  after any context has been pushed.
@@ -521,7 +521,7 @@
      * Returns true if namespace declaration attributes are placed into
      * a namespace.  This behavior is not the default.
      *
-     * @since SAX 2.1alpha
+     * @since 1.5, SAX 2.1alpha
      */
     public boolean isNamespaceDeclUris ()
         { return namespaceDeclUris; }
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/helpers/ParserAdapter.java
--- a/jaxp/src/org/xml/sax/helpers/ParserAdapter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/helpers/ParserAdapter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -72,7 +72,7 @@
  * <p>This adapter does not test for duplicate Namespace-qualified
  * attribute names.</p>
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson
  * @version 2.0.1 (sax2r2)
  * @see org.xml.sax.helpers.XMLReaderAdapter
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/helpers/ParserFactory.java
--- a/jaxp/src/org/xml/sax/helpers/ParserFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/helpers/ParserFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -61,7 +61,7 @@
  * @deprecated This class works with the deprecated
  *             {@link org.xml.sax.Parser Parser}
  *             interface.
- * @since SAX 1.0
+ * @since 1.4, SAX 1.0
  * @author David Megginson
  * @version 2.0.1 (sax2r2)
  */
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/helpers/XMLFilterImpl.java
--- a/jaxp/src/org/xml/sax/helpers/XMLFilterImpl.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/helpers/XMLFilterImpl.java	Wed Jul 09 10:41:31 2014 -0700
@@ -65,7 +65,7 @@
  * specific methods to modify the event stream or the configuration
  * requests as they pass through.</p>
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson
  * @see org.xml.sax.XMLFilter
  * @see org.xml.sax.XMLReader
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/helpers/XMLReaderAdapter.java
--- a/jaxp/src/org/xml/sax/helpers/XMLReaderAdapter.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/helpers/XMLReaderAdapter.java	Wed Jul 09 10:41:31 2014 -0700
@@ -68,7 +68,7 @@
  * supports a false value for the http://xml.org/sax/features/namespaces
  * property, that will also be used to improve efficiency.</p>
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson
  * @see org.xml.sax.Parser
  * @see org.xml.sax.XMLReader
diff -r 709d34294db7 -r d501c3d3dab3 jaxp/src/org/xml/sax/helpers/XMLReaderFactory.java
--- a/jaxp/src/org/xml/sax/helpers/XMLReaderFactory.java	Thu Jul 03 11:37:01 2014 -0700
+++ b/jaxp/src/org/xml/sax/helpers/XMLReaderFactory.java	Wed Jul 09 10:41:31 2014 -0700
@@ -67,7 +67,7 @@
  * nothing bound its class name to <code>org.xml.sax.driver</code> so
  * those configuration mechanisms would see it.</p>
  *
- * @since SAX 2.0
+ * @since 1.4, SAX 2.0
  * @author David Megginson, David Brownell
  * @version 2.0.1 (sax2r2)
  */