You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ru...@apache.org on 2005/12/09 08:59:58 UTC
svn commit: r355405 - in /webservices/axis2/trunk/java/modules:
saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java
xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
xml/test/org/apache/axis2/om/AttrNsTest.java
Author: ruchithf
Date: Thu Dec 8 23:59:28 2005
New Revision: 355405
URL: http://svn.apache.org/viewcvs?rev=355405&view=rev
Log:
Fix for JIRA:AXIS2-329 and a test method added to AttrNsTest
Modified:
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AttrNsTest.java
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java?rev=355405&r1=355404&r2=355405&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java Thu Dec 8 23:59:28 2005
@@ -103,8 +103,7 @@
}
- public String getLocalName()
- {
+ public String getLocalName() {
return null; //Override in AttrImpl and ElementImpl
}
@@ -123,8 +122,7 @@
/*
* Overidden in ElementImpl and AttrImpl
*/
- public String getPrefix()
- {
+ public String getPrefix() {
return null;
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java?rev=355405&r1=355404&r2=355405&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java Thu Dec 8 23:59:28 2005
@@ -16,27 +16,37 @@
package org.apache.axis2.om.impl.llom;
-import org.apache.axis2.om.*;
+import java.io.ByteArrayOutputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.axis2.om.OMAttribute;
+import org.apache.axis2.om.OMConstants;
+import org.apache.axis2.om.OMContainer;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMException;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.OMText;
+import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.OMContainerEx;
import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.apache.axis2.om.impl.llom.traverse.OMChildElementIterator;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenIterator;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenQNameIterator;
import org.apache.axis2.om.impl.llom.util.EmptyIterator;
-import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.apache.axis2.om.util.ElementHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamConstants;
-import java.io.ByteArrayOutputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-
/**
* Class OMElementImpl
*/
@@ -361,7 +371,12 @@
if (namespace != null && uri.equalsIgnoreCase(namespace.getName())) {
return namespace;
} else {
- return null;
+ //Check whether the given prefix and uri is XML prefix and ns
+ if(prefix.equals(OMConstants.XMLNS_PREFIX) && uri.equals(OMConstants.XMLNS_URI)) {
+ return new OMNamespaceImpl(uri, prefix);
+ } else {
+ return null;
+ }
}
// return (OMNamespace) namespaces.get(prefix);
}
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AttrNsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AttrNsTest.java?rev=355405&r1=355404&r2=355405&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AttrNsTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AttrNsTest.java Thu Dec 8 23:59:28 2005
@@ -16,6 +16,11 @@
package org.apache.axis2.om;
+import java.io.ByteArrayInputStream;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.custommonkey.xmlunit.Diff;
import org.w3c.dom.Document;
@@ -38,6 +43,27 @@
Diff diff = compareXML(document1, document2);
assertXMLEqual(diff, true);
}
+
+
+ /**
+ * Test method to test the XML namespace
+ * @throws Exception
+ */
+ public void testAttr() throws Exception{
+ String xml = "<wsp:Policy xml:base=\"uri:thisBase\" " +
+ "xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\">" +
+ "</wsp:Policy>";
+
+ ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
+ StAXOMBuilder builder = new StAXOMBuilder(bais);
+ OMElement elem = builder.getDocumentElement();
+ elem.build();
+ assertEquals("Attribute value mismatch", "uri:thisBase", elem.getAttributeValue(new QName(OMConstants.XMLNS_URI,"base")));
+
+ OMAttribute attr = elem.getAttribute(new QName(OMConstants.XMLNS_URI,"base"));
+
+ assertEquals("Attribute namespace mismatch", OMConstants.XMLNS_URI, attr.getNamespace().getName());
+ }
}