Index: build.xml
===================================================================
--- build.xml	(revision 1835199)
+++ build.xml	(working copy)
@@ -286,7 +286,7 @@
       </fileset>
     </copy>
 
-    <xjavac srcdir="${build.src}"
+    <!--xjavac srcdir="${build.src}"
            destdir="${build.dest}"
            source="${javac.source}"
            target="${javac.target}"
@@ -308,7 +308,32 @@
                 org/w3c/dom/traversal/**
                 org/w3c/dom/views/**
                 org/w3c/dom/xpath/**"
-           />
+           /-->
+     <xjavac srcdir="${build.src}"
+       destdir="${build.dest}"
+       source="${javac.source}"
+       target="${javac.target}"
+       classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"
+       debug="${debug}"
+       debuglevel="${debuglevel}"
+       deprecation="${deprecation}"
+       optimize="${optimize}"
+       includeAntRuntime="false"
+       includeJavaRuntime="false"
+       excludes="org/xml/sax/** 
+            javax/xml/**
+            org/w3c/dom/*
+            org/w3c/dom/bootstrap/**
+            org/w3c/dom/events/**
+            org/w3c/dom/ls/**
+            org/w3c/dom/html/**
+            org/w3c/dom/ranges/**
+            org/w3c/dom/traversal/**
+            org/w3c/dom/views/**
+            org/w3c/dom/xpath/**"
+       >
+       <compilerarg line="-Xbootclasspath/p:${tools.dir}/${jar.apis}"/>
+</xjavac>
   </target>
 
   <!-- =================================================================== -->
Index: src/org/apache/xerces/dom/NamedNodeMapImpl.java
===================================================================
--- src/org/apache/xerces/dom/NamedNodeMapImpl.java	(revision 1835199)
+++ src/org/apache/xerces/dom/NamedNodeMapImpl.java	(working copy)
@@ -605,7 +605,8 @@
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
         if (nodes != null) {
-            nodes = new ArrayList(nodes);
+            // cast to Vector is required
+            nodes = new ArrayList((Vector)nodes);
         }
     }
 
Index: src/org/apache/xerces/impl/dv/xs/TypeValidator.java
===================================================================
--- src/org/apache/xerces/impl/dv/xs/TypeValidator.java	(revision 1835199)
+++ src/org/apache/xerces/impl/dv/xs/TypeValidator.java	(working copy)
@@ -17,8 +17,12 @@
 
 package org.apache.xerces.impl.dv.xs;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
 import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
 import org.apache.xerces.impl.dv.ValidationContext;
+import org.apache.xerces.util.XMLChar;
 
 /**
  * All primitive types plus ID/IDREF/ENTITY/INTEGER are derived from this abstract
@@ -34,6 +38,15 @@
  * @version $Id$
  */
 public abstract class TypeValidator {
+    
+    private static final boolean USE_CODE_POINT_COUNT_FOR_STRING_LENGTH = AccessController.doPrivileged(new PrivilegedAction() {
+        public Object run() {
+            try {
+                return Boolean.getBoolean("org.apache.xerces.impl.dv.xs.useCodePointCountForStringLength") ? Boolean.TRUE : Boolean.FALSE;
+            }
+            catch (SecurityException ex) {}
+            return Boolean.FALSE;
+        }}) == Boolean.TRUE;
 
     // which facets are allowed for this type
     public abstract short getAllowedFacets();
@@ -79,7 +92,14 @@
     // get the length of the value
     // the parameters are in compiled form (from getActualValue)
     public int getDataLength(Object value) {
-        return (value instanceof String) ? ((String)value).length() : -1;
+        if (value instanceof String) {
+            final String str = (String)value;
+            if (!USE_CODE_POINT_COUNT_FOR_STRING_LENGTH) {
+                return str.length();
+            }
+            return getCodePointLength(str);
+        }
+        return -1;
     }
 
     // get the number of digits of the value
@@ -93,6 +113,25 @@
     public int getFractionDigits(Object value) {
         return -1;
     }
+    
+    // Returns the length of the string in Unicode code points.
+    private int getCodePointLength(String value) {
+        // Count the number of surrogate pairs, and subtract them from
+        // the total length.
+        final int len = value.length();
+        int surrogatePairCount = 0;
+        for (int i = 0; i < len - 1; ++i) {
+            if (XMLChar.isHighSurrogate(value.charAt(i))) {
+                if (XMLChar.isLowSurrogate(value.charAt(++i))) {
+                    ++surrogatePairCount;
+                }
+                else {
+                    --i;
+                }
+            }
+        }
+        return len - surrogatePairCount;
+    }
 
     // check whether the character is in the range 0x30 ~ 0x39
     public static final boolean isDigit(char ch) {