You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/08/07 00:52:37 UTC

svn commit: r801829 - in /tuscany/java/sca/modules/common-xml/src: main/java/org/apache/tuscany/sca/common/xml/dom/ main/java/org/apache/tuscany/sca/common/xml/stax/ main/resources/ test/java/org/apache/tuscany/sca/common/xml/stax/

Author: rfeng
Date: Thu Aug  6 22:52:36 2009
New Revision: 801829

URL: http://svn.apache.org/viewvc?rev=801829&view=rev
Log:
Fix the DOM XMLStreamReader

Added:
    tuscany/java/sca/modules/common-xml/src/main/resources/
Modified:
    tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java
    tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXmlNodeImpl.java
    tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
    tuscany/java/sca/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java

Modified: tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java?rev=801829&r1=801828&r2=801829&view=diff
==============================================================================
--- tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java (original)
+++ tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java Thu Aug  6 22:52:36 2009
@@ -60,10 +60,18 @@
 
     public static QName getQName(Node node) {
         String ns = node.getNamespaceURI();
+        String prefix = node.getPrefix();
+        String localName = node.getLocalName();
+        if (localName == null) {
+            localName = node.getNodeName();
+        }
         if (ns == null) {
             ns = "";
         }
-        return new QName(ns, node.getNodeName());
+        if (prefix == null) {
+            prefix = "";
+        }
+        return new QName(ns, localName, prefix);
     }
 
     public static Element createElement(Document document, QName name) {

Modified: tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXmlNodeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXmlNodeImpl.java?rev=801829&r1=801828&r2=801829&view=diff
==============================================================================
--- tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXmlNodeImpl.java (original)
+++ tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/DOMXmlNodeImpl.java Thu Aug  6 22:52:36 2009
@@ -27,6 +27,7 @@
 
 import javax.xml.namespace.QName;
 
+import org.apache.tuscany.sca.common.xml.dom.DOMHelper;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -109,14 +110,7 @@
     }
 
     private static QName getQName(Node node) {
-        int type = node.getNodeType();
-        if (type == Node.ELEMENT_NODE || type == Node.ATTRIBUTE_NODE) {
-            String ns = node.getNamespaceURI();
-            String prefix = node.getPrefix();
-            String localName = node.getLocalName();
-            return new QName(ns == null ? "" : ns, localName, prefix == null ? "" : prefix);
-        }
-        return null;
+        return DOMHelper.getQName(node);
     }
 
     /**

Modified: tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java?rev=801829&r1=801828&r2=801829&view=diff
==============================================================================
--- tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java (original)
+++ tuscany/java/sca/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java Thu Aug  6 22:52:36 2009
@@ -67,13 +67,14 @@
         return inputFactory.createXMLStreamReader(source);
     }
 
-    /*
     public XMLStreamReader createXMLStreamReader(Node node) throws XMLStreamException {
+        /*
         // DOMSource is not supported by the XMLInputFactory from JDK 6
         DOMSource source = new DOMSource(node);
         return createXMLStreamReader(source);
+        */
+        return new DOMXMLStreamReader(node);
     }
-    */
 
     public XMLStreamReader createXMLStreamReader(String string) throws XMLStreamException {
         StringReader reader = new StringReader(string);

Modified: tuscany/java/sca/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java?rev=801829&r1=801828&r2=801829&view=diff
==============================================================================
--- tuscany/java/sca/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java (original)
+++ tuscany/java/sca/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java Thu Aug  6 22:52:36 2009
@@ -48,9 +48,10 @@
         assertNotNull(reader);
 
         Node node = helper.saveAsNode(reader);
-        // reader = helper.createXMLStreamReader(node);
         assertNotNull(node.getFirstChild());
-
+        reader = helper.createXMLStreamReader(node);
+        xml = helper.saveAsString(reader);
+        XMLAssert.assertXMLEqual(XML, xml);
     }
 
 }