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 2006/03/04 17:40:31 UTC
svn commit: r383156 - in
/webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom:
AttrImpl.java ElementImpl.java
Author: ruchithf
Date: Sat Mar 4 08:40:31 2006
New Revision: 383156
URL: http://svn.apache.org/viewcvs?rev=383156&view=rev
Log:
Fixed a default namespace bug in doom to produce proper canonicalized nodes with xml-sec
Modified:
webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/AttrImpl.java
webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/ElementImpl.java
Modified: webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/AttrImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/AttrImpl.java?rev=383156&r1=383155&r2=383156&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/AttrImpl.java (original)
+++ webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/AttrImpl.java Sat Mar 4 08:40:31 2006
@@ -99,7 +99,8 @@
* Returns the name of this attribute.
*/
public String getNodeName() {
- return (this.namespace != null && !"".equals(this.namespace))
+ return (this.namespace != null
+ && !"".equals(this.namespace.getPrefix()) && !(OMConstants.XMLNS_NS_PREFIX.equals(this.attrName)))
? this.namespace.getPrefix()+ ":" + this.attrName
: this.attrName;
}
Modified: webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/ElementImpl.java?rev=383156&r1=383155&r2=383156&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/ElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/ElementImpl.java Sat Mar 4 08:40:31 2006
@@ -1216,6 +1216,8 @@
if (this.parentNode.getNamespaceURI() != this.getNamespaceURI()) {
AttrImpl attr = new AttrImpl(this.ownerNode, "xmlns",
this.namespace.getName());
+ attr.setOMNamespace(new NamespaceImpl(
+ OMConstants.XMLNS_NS_URI, OMConstants.XMLNS_NS_PREFIX));
attributeMap.addItem(attr);
}
}