ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1608084 - in /webservices/axiom/trunk/modules/axiom-dom/src: main/java/org/apache/axiom/om/impl/dom/ test/java/org/apache/axiom/om/impl/dom/
Date Sat, 05 Jul 2014 17:59:30 GMT
Author: veithen
Date: Sat Jul  5 17:59:29 2014
New Revision: 1608084

URL: http://svn.apache.org/r1608084
Log:
Some DOOM fixes.

Modified:
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMImplementationImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMUtil.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
    webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
    webservices/axiom/trunk/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/DOMImplementationTest.java

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMImplementationImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMImplementationImpl.java?rev=1608084&r1=1608083&r2=1608084&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMImplementationImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMImplementationImpl.java
Sat Jul  5 17:59:29 2014
@@ -26,6 +26,7 @@ import org.w3c.dom.DOMException;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
 
 public class DOMImplementationImpl implements DOMImplementation {
     private final OMFactory factory;
@@ -46,9 +47,8 @@ public class DOMImplementationImpl imple
         // TODO Handle docType stuff
         DocumentImpl doc = new DocumentImpl(factory);
 
-        new ElementImpl(doc, DOMUtil.getLocalName(qualifiedName),
-                        new OMNamespaceImpl(namespaceURI, DOMUtil
-                                .getPrefix(qualifiedName)), null, factory, false);
+        Element element = doc.createElementNS(namespaceURI, qualifiedName);
+        doc.appendChild(element);
 
         return doc;
     }

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMUtil.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMUtil.java?rev=1608084&r1=1608083&r2=1608084&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMUtil.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMUtil.java
Sat Jul  5 17:59:29 2014
@@ -32,29 +32,27 @@ class DOMUtil {
         return true;
     }
 
-    public static void validateAttrNamespace(String namespaceURI, String localName, String
prefix) {
-        // TODO check for valid namespace
-        /**
-         * if the qualifiedName has a prefix and the namespaceURI is null, if
-         * the qualifiedName has a prefix that is "xml" and the namespaceURI is
-         * different from " http://www.w3.org/XML/1998/namespace", or if the
-         * qualifiedName, or its prefix, is "xmlns" and the namespaceURI is
-         * different from " http://www.w3.org/2000/xmlns/".
-         */
+    private static void validateName(String namespaceURI, String localName, String prefix)
{
+        if (prefix != null && !XMLChar.isValidNCName(prefix)
+                || !XMLChar.isValidNCName(localName)) {
+            throw DOMUtil.newDOMException(DOMException.INVALID_CHARACTER_ERR);
+        }
+        if (namespaceURI == null && prefix != null
+                || XMLConstants.XML_NS_PREFIX.equals(prefix) && !XMLConstants.XML_NS_URI.equals(namespaceURI))
{
+            throw DOMUtil.newDOMException(DOMException.NAMESPACE_ERR);
+        }
+    }
+    
+    public static void validateElementName(String namespaceURI, String localName, String
prefix) {
+        validateName(namespaceURI, localName, prefix);
+    }
+
+    public static void validateAttrName(String namespaceURI, String localName, String prefix)
{
+        validateName(namespaceURI, localName, prefix);
         
-        if (namespaceURI == null) {
-            if (localName.equals(XMLConstants.XMLNS_ATTRIBUTE)) {
-                throw DOMUtil.newDOMException(DOMException.NAMESPACE_ERR);
-            }
-        } else if (namespaceURI.equals(XMLConstants.XMLNS_ATTRIBUTE_NS_URI)) {
-            if (prefix != null && !prefix.equals(XMLConstants.XMLNS_ATTRIBUTE)
-                    || prefix == null && !localName.equals(XMLConstants.XMLNS_ATTRIBUTE))
{
-                throw DOMUtil.newDOMException(DOMException.NAMESPACE_ERR);
-            }
-        } else {
-            if (prefix.equals(XMLConstants.XMLNS_ATTRIBUTE)) {
-                throw DOMUtil.newDOMException(DOMException.NAMESPACE_ERR);
-            }
+        if (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix != null ? prefix : localName)
+                != XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI)) {
+            throw DOMUtil.newDOMException(DOMException.NAMESPACE_ERR);
         }
     }
 
@@ -65,7 +63,13 @@ class DOMUtil {
      */
     public static String getLocalName(String qualifiedName) {
         int idx = qualifiedName.indexOf(':');
-        return idx == -1 ? qualifiedName : qualifiedName.substring(idx+1);
+        if (idx == -1) {
+            return qualifiedName;
+        } else if (qualifiedName.indexOf(':', idx+1) == -1) {
+            return qualifiedName.substring(idx+1);
+        } else {
+            throw newDOMException(DOMException.NAMESPACE_ERR);
+        }
     }
 
     /**
@@ -75,7 +79,13 @@ class DOMUtil {
      */
     public static String getPrefix(String qualifiedName) {
         int idx = qualifiedName.indexOf(':');
-        return idx == -1 ? null : qualifiedName.substring(0, idx);
+        if (idx == -1) {
+            return null;
+        } else if (idx == 0 || idx == qualifiedName.length()-1) {
+            throw newDOMException(DOMException.NAMESPACE_ERR);
+        } else {
+            return qualifiedName.substring(0, idx);
+        }
     }
     
     public static DOMException newDOMException(short code) {

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java?rev=1608084&r1=1608083&r2=1608084&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
Sat Jul  5 17:59:29 2014
@@ -133,11 +133,7 @@ public class DocumentImpl extends RootNo
             throws DOMException {
         String localName = DOMUtil.getLocalName(qualifiedName);
         String prefix = DOMUtil.getPrefix(qualifiedName);
-        DOMUtil.validateAttrNamespace(namespaceURI, localName, prefix);
-
-        if (!XMLConstants.XMLNS_ATTRIBUTE.equals(localName)) {
-            this.checkQName(prefix, localName);
-        }
+        DOMUtil.validateAttrName(namespaceURI, localName, prefix);
 
         OMNamespace namespace;
         if (namespaceURI == null) {
@@ -172,24 +168,22 @@ public class DocumentImpl extends RootNo
         return element;
     }
 
-    public Element createElementNS(String ns, String qualifiedName)
+    public Element createElementNS(String namespaceURI, String qualifiedName)
             throws DOMException {
 
-        if (ns == null) ns = "";
+        if (namespaceURI != null && namespaceURI.length() == 0) {
+            namespaceURI = null;
+        }
 
         String localName = DOMUtil.getLocalName(qualifiedName);
         String prefix = DOMUtil.getPrefix(qualifiedName);
-        checkQName(prefix, localName);
+        DOMUtil.validateElementName(namespaceURI, localName, prefix);
         
-        if(prefix == null) {
-            prefix = "";
-        }
-
         OMNamespaceImpl namespace;
-        if (ns.length() == 0) {
+        if (namespaceURI == null) {
             namespace = null;
         } else {
-            namespace = new OMNamespaceImpl(ns, prefix);
+            namespace = new OMNamespaceImpl(namespaceURI, prefix == null ? "" : prefix);
         }
         ElementImpl element = new ElementImpl(null, localName, namespace, null, this.factory,
false);
         element.setOwnerDocument(this);
@@ -452,21 +446,6 @@ public class DocumentImpl extends RootNo
         return (Element) this.getOMDocumentElement();
     }
 
-    /**
-     * Borrowed from the Xerces impl. Checks if the given qualified name is legal with respect
to
-     * the version of XML to which this document must conform.
-     *
-     * @param prefix prefix of qualified name
-     * @param local  local part of qualified name
-     */
-    protected final void checkQName(String prefix, String local) {
-        // check that both prefix and local part match NCName
-        if ((prefix != null && !XMLChar.isValidNCName(prefix))
-                || !XMLChar.isValidNCName(local)) {
-            throw DOMUtil.newDOMException(DOMException.INVALID_CHARACTER_ERR);
-        }
-    }
-
     protected void addIdAttr(Attr attr) {
         if (this.idAttrs == null) {
             this.idAttrs = new Vector();

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1608084&r1=1608083&r2=1608084&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
Sat Jul  5 17:59:29 2014
@@ -428,7 +428,7 @@ public class ElementImpl extends ParentN
         }
         String localName = DOMUtil.getLocalName(qualifiedName);
         String prefix = DOMUtil.getPrefix(qualifiedName);
-        DOMUtil.validateAttrNamespace(namespaceURI, localName, prefix);
+        DOMUtil.validateAttrName(namespaceURI, localName, prefix);
         
         AttrImpl attr = (AttrImpl)getAttributeNodeNS(namespaceURI, localName);
         if (attr != null) {

Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java?rev=1608084&r1=1608083&r2=1608084&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
Sat Jul  5 17:59:29 2014
@@ -571,26 +571,34 @@ public abstract class ParentNode extends
         }
     }
     
-    public final NodeList getElementsByTagNameNS(String namespaceURI, String localName) {
-        final QName qname = new QName(namespaceURI, localName);
+    private NodeList getElementsWildcard() {
         return new NodeListImpl() {
             protected Iterator getIterator() {
-                return new OMQNameFilterIterator(getDescendants(false), qname);
+                return new OMFilterIterator(getDescendants(false)) {
+                    protected boolean matches(OMNode node) {
+                        return node.getType() == OMNode.ELEMENT_NODE;
+                    }
+                };
             }
         };
     }
-
-    public final NodeList getElementsByTagName(final String name) {
-        if (name.equals("*")) {
+    
+    public final NodeList getElementsByTagNameNS(String namespaceURI, String localName) {
+        if ("*".equals(namespaceURI) && "*".equals(localName)) {
+            return getElementsWildcard();
+        } else {
+            final QName qname = new QName(namespaceURI, localName);
             return new NodeListImpl() {
                 protected Iterator getIterator() {
-                    return new OMFilterIterator(getDescendants(false)) {
-                        protected boolean matches(OMNode node) {
-                            return node.getType() == OMNode.ELEMENT_NODE;
-                        }
-                    };
+                    return new OMQNameFilterIterator(getDescendants(false), qname);
                 }
             };
+        }
+    }
+
+    public final NodeList getElementsByTagName(final String name) {
+        if (name.equals("*")) {
+            return getElementsWildcard();
         } else {
             return new NodeListImpl() {
                 protected Iterator getIterator() {

Modified: webservices/axiom/trunk/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/DOMImplementationTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/DOMImplementationTest.java?rev=1608084&r1=1608083&r2=1608084&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/DOMImplementationTest.java
(original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/DOMImplementationTest.java
Sat Jul  5 17:59:29 2014
@@ -86,32 +86,12 @@ public class DOMImplementationTest exten
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrnormalize)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrsetvalue2)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/attrgetownerelement05)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createAttributeNS01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createAttributeNS02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createAttributeNS04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createAttributeNS06)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument02)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument03)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument05)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument06)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument08)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType02)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType03)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocumentType04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createElementNS01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createElementNS02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createElementNS04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentcreateattributeNS03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentcreateattributeNS04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentcreateattributeNS05)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentcreateattributeNS06)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentcreateattributeNS07)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentcreateelementNS05)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentcreateelementNS06)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentgetelementsbytagnameNS01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentgetelementsbytagnameNS02)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentimportnode07)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documentimportnode08)");
@@ -125,27 +105,13 @@ public class DOMImplementationTest exten
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documenttypeinternalSubset01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documenttypepublicid01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/documenttypesystemid01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/domimplementationcreatedocument04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/domimplementationcreatedocument05)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/domimplementationcreatedocument07)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/domimplementationcreatedocumenttype01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/domimplementationcreatedocumenttype02)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/domimplementationcreatedocumenttype04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementgetattributenodens01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementgetelementsbytagnamens04)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementgetelementsbytagnamens05)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementhasattributens01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementhasattributens02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementremoveattributens01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementsetattributenodens04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementsetattributenodens05)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementsetattributens01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementsetattributens02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementsetattributens03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementsetattributens04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementsetattributens05)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementsetattributens08)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/elementsetattributensurinull)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getElementById01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getElementsByTagNameNS01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/getElementsByTagNameNS02)");
@@ -179,17 +145,13 @@ public class DOMImplementationTest exten
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapgetnameditemns06)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapremovenameditemns02)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapremovenameditemns04)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapsetnameditemns01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapsetnameditemns03)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapsetnameditemns04)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapsetnameditemns06)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapsetnameditemns07)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/namednodemapsetnameditemns08)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodegetlocalname03)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodegetownerdocument01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodegetownerdocument02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodegetprefix03)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodehasattributes04)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodeissupported01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodeissupported02)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/nodeissupported03)");
@@ -206,11 +168,6 @@ public class DOMImplementationTest exten
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/prefix07)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/prefix09)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/removeAttributeNS02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/setAttributeNS01)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/setAttributeNS02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/setAttributeNS06)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/setAttributeNS07)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/setAttributeNS10)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/attrisid04)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/attrisid05)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/attrisid07)");
@@ -424,7 +381,6 @@ public class DOMImplementationTest exten
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode11)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode13)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode14)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode19)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodeisequalnode22)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodelookupprefix12)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/noderemovechild19)");
@@ -444,7 +400,6 @@ public class DOMImplementationTest exten
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodesettextcontent12)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodesetuserdata01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodesetuserdata02)");
-        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/nodesetuserdata05)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/normalizecharacters01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/normalizecharacters03)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/normalizecharacters05)");
@@ -466,6 +421,7 @@ public class DOMImplementationTest exten
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed01)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed02)");
         builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed03)");
+        builder.exclude(W3CTestCase.class, "(id=http://www.w3.org/2001/DOM-Test-Suite/level3/core/wellformed04)");
         
         return builder.build();
     }



Mime
View raw message