svn commit: r726316 - in /webservices/commons/trunk/modules/axiom/modules: axiom-api/src/main/java/org/apache/axiom/om/impl/builder/ axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/

[veithen]

Author: veithen
Date: Sat Dec 13 16:22:51 2008
New Revision: 726316

URL: http://svn.apache.org/viewvc?rev=726316&view=rev
Log:
WSCOMMONS-373: Correctly handle default namespaces in SAXOMBuilder.

Modified:
    
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java
    
webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderJAXBTest.java
    
webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderSAXParserTest.java
    
webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderXMLBeansTest.java

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java?rev=726316&r1=726315&r2=726316&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java
 Sat Dec 13 16:22:51 2008
@@ -94,7 +94,11 @@
             throws SAXException {
         if (nextElem == null)
             nextElem = createNextElement(null);
-        nextElem.declareNamespace(uri, prefix);
+        if (prefix.length() == 0) {
+            nextElem.declareDefaultNamespace(uri);
+        } else {
+            nextElem.declareNamespace(uri, prefix);
+        }
     }
 
     public void endPrefixMapping(String arg0) throws SAXException {

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderJAXBTest.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderJAXBTest.java?rev=726316&r1=726315&r2=726316&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderJAXBTest.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderJAXBTest.java
 Sat Dec 13 16:22:51 2008
@@ -52,7 +52,6 @@
         SAXOMBuilder builder = new SAXOMBuilder();
         marshaller.marshal(order, builder);
         
-//        assertXMLIdentical(compareXML(out.toString(), 
builder.getRootElement().toString()), true);
-        assertXMLEqual(compareXML(out.toString(), 
builder.getRootElement().toString()), true);
+        assertXMLIdentical(compareXML(out.toString(), 
builder.getRootElement().toString()), true);
     }
 }

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderSAXParserTest.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderSAXParserTest.java?rev=726316&r1=726315&r2=726316&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderSAXParserTest.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderSAXParserTest.java
 Sat Dec 13 16:22:51 2008
@@ -51,8 +51,7 @@
         }
         in = SAXOMBuilderSAXParserTest.class.getResourceAsStream("test.xml");
         try {
-//            assertXMLIdentical(compareXML(new InputSource(in), 
toInputSource(builder.getRootElement())), true);
-            assertXMLEqual(compareXML(new InputSource(in), 
toInputSource(builder.getRootElement())), true);
+            assertXMLIdentical(compareXML(new InputSource(in), 
toInputSource(builder.getRootElement())), true);
         } finally {
             in.close();
         }

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderXMLBeansTest.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderXMLBeansTest.java?rev=726316&r1=726315&r2=726316&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderXMLBeansTest.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-integration/src/test/java/org/apache/axiom/om/impl/builder/SAXOMBuilderXMLBeansTest.java
 Sat Dec 13 16:22:51 2008
@@ -43,6 +43,6 @@
         SAXOMBuilder builder = new SAXOMBuilder();
         document.save(builder, builder);
         
-        assertXMLEqual(compareXML(out.toString(), 
builder.getRootElement().toString()), true);
+        assertXMLIdentical(compareXML(out.toString(), 
builder.getRootElement().toString()), true);
     }
 }