You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ch...@apache.org on 2006/07/26 08:11:03 UTC
svn commit: r425639 [1/2] - in /webservices/commons/trunk/modules/axiom:
src/org/apache/axiom/om/ src/org/apache/axiom/om/impl/dom/
src/org/apache/axiom/om/impl/llom/ src/org/apache/axiom/om/impl/llom/util/
src/org/apache/axiom/om/impl/util/ src/org/ap...
Author: chinthaka
Date: Tue Jul 25 23:11:01 2006
New Revision: 425639
URL: http://svn.apache.org/viewvc?rev=425639&view=rev
Log:
Deprecating getName() method of OMNamespace and adding getNamespaceURI() method, as per http://issues.apache.org/jira/browse/WSCOMMONS-16
Modified:
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/OMNamespace.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/AttrImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/NamespaceImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/TextImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMAttributeImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMNamespaceImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMStAXWrapper.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMTextImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/util/XMLComparator.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/util/ElementHelper.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/xpath/DocumentNavigator.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/builder/SOAPBuilderHelper.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultTextImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPHeaderImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultTextImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderImpl.java
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderImpl.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/AttrNsTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/DefaultNSHandlingTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTestUtils.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTextTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/dom/ElementImplTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/dom/OMTestUtils.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/llom/OMNamespaceImplTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/llom/OMSourcedElementTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPEnvelopeTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPFaultDetailTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPFaultTextTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPHeaderTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilderTest.java
webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/impl/llom/OMElementTest.java
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/OMNamespace.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/OMNamespace.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/OMNamespace.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/OMNamespace.java Tue Jul 25 23:11:01 2006
@@ -39,7 +39,15 @@
/**
* Method getName.
*
+ * @deprecated This method is deprecated. Please use getNamespaceURI() method instead.
+ *
* @return Returns String.
*/
public String getName();
+
+ /**
+ * Provides the namespace URI of this namespace.
+ * @return - the namespace URI of the namespace.
+ */
+ public String getNamespaceURI();
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/AttrImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/AttrImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/AttrImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/AttrImpl.java Tue Jul 25 23:11:01 2006
@@ -233,7 +233,7 @@
*/
public QName getQName() {
return (this.namespace == null) ? new QName(this.attrName) : new QName(
- this.namespace.getName(), this.attrName, this.namespace
+ this.namespace.getNamespaceURI(), this.attrName, this.namespace
.getPrefix());
}
@@ -353,7 +353,7 @@
*/
public String getNamespaceURI() {
if (this.namespace != null) {
- return namespace.getName();
+ return namespace.getNamespaceURI();
}
return null;
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java Tue Jul 25 23:11:01 2006
@@ -230,7 +230,7 @@
|| (currentEvent == END_ELEMENT)
|| (currentEvent == NAMESPACE)) {
OMNamespace ns = ((OMElement) lastNode).getNamespace();
- returnStr = (ns == null) ? null : ns.getName();
+ returnStr = (ns == null) ? null : ns.getNamespaceURI();
}
}
return returnStr;
@@ -412,7 +412,7 @@
|| (currentEvent == NAMESPACE)) {
OMNamespace ns = (OMNamespace) getItemFromIterator(
((OMElement) lastNode).getAllDeclaredNamespaces(), i);
- returnString = (ns == null) ? null : ns.getName();
+ returnString = (ns == null) ? null : ns.getNamespaceURI();
}
}
return returnString;
@@ -589,7 +589,7 @@
if (attrib != null) {
OMNamespace nameSpace = attrib.getNamespace();
if (nameSpace != null) {
- returnString = nameSpace.getName();
+ returnString = nameSpace.getNamespaceURI();
}
}
} else {
@@ -1165,7 +1165,7 @@
String localPart = element.getLocalName();
if (ns != null) {
String prefix = ns.getPrefix();
- String uri = ns.getName();
+ String uri = ns.getNamespaceURI();
if ((prefix == null) || prefix.equals("")) {
returnName = new QName(uri, localPart);
} else {
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/ElementImpl.java Tue Jul 25 23:11:01 2006
@@ -180,7 +180,7 @@
* Returns the value of the namespace URI.
*/
public String getNamespaceURI() {
- return (this.namespace != null) ? this.namespace.getName() : null;
+ return (this.namespace != null) ? this.namespace.getNamespaceURI() : null;
}
// /
@@ -366,7 +366,7 @@
if (namespaceURI == OMConstants.XMLNS_NS_URI) {
OMNamespace ns = this.findNamespaceURI(localName);
AttrImpl namespaceAttr = new AttrImpl(this.ownerNode, localName, ns
- .getName(), this.factory);
+ .getNamespaceURI(), this.factory);
NamespaceImpl xmlNs = new NamespaceImpl(OMConstants.XMLNS_NS_URI);
namespaceAttr.setOMNamespace(xmlNs);
return namespaceAttr;
@@ -653,9 +653,9 @@
public OMAttribute addAttribute(OMAttribute attr) {
OMNamespace namespace = attr.getNamespace();
if (namespace != null
- && this.findNamespace(namespace.getName(), namespace
+ && this.findNamespace(namespace.getNamespaceURI(), namespace
.getPrefix()) == null) {
- this.declareNamespace(namespace.getName(), namespace.getPrefix());
+ this.declareNamespace(namespace.getNamespaceURI(), namespace.getPrefix());
}
if (attr.getNamespace() != null) { // If the attr has a namespace
@@ -673,11 +673,11 @@
*/
public OMAttribute addAttribute(String attributeName, String value,
OMNamespace ns) {
- if (ns != null && findNamespace(ns.getName(), ns.getPrefix()) != null) {
+ if (ns != null && findNamespace(ns.getNamespaceURI(), ns.getPrefix()) != null) {
declareNamespace(ns);
}
if (ns != null) {
- return this.addAttribute(ns.getName(), ns.getPrefix() + ":"
+ return this.addAttribute(ns.getNamespaceURI(), ns.getPrefix() + ":"
+ attributeName, value);
} else {
return this.addAttribute(null, attributeName, value);
@@ -699,10 +699,10 @@
if (namespace != null) {
String prefix = namespace.getPrefix();
if ("".equals(prefix)) {
- namespace = declareDefaultNamespace(namespace.getName());
+ namespace = declareDefaultNamespace(namespace.getNamespaceURI());
} else if (prefix == null) {
prefix = OMSerializerUtil.getNextNSPrefix();
- namespace = new NamespaceImpl(namespace.getName(), prefix);
+ namespace = new NamespaceImpl(namespace.getNamespaceURI(), prefix);
}
if (!namespace.getPrefix().startsWith(OMConstants.XMLNS_NS_PREFIX)) {
@@ -824,7 +824,7 @@
while (namespaceListIterator.hasNext()) {
OMNamespace omNamespace = (OMNamespace) namespaceListIterator
.next();
- String nsURI = omNamespace.getName();
+ String nsURI = omNamespace.getNamespaceURI();
if (nsURI != null && nsURI.equals(uri)) {
return omNamespace;
}
@@ -832,7 +832,7 @@
} else {
OMNamespace namespace = (OMNamespace) namespaces.get(prefix);
- if (namespace != null && uri.equalsIgnoreCase(namespace.getName())) {
+ if (namespace != null && uri.equalsIgnoreCase(namespace.getNamespaceURI())) {
return namespace;
}
}
@@ -915,10 +915,10 @@
QName qName;
if (namespace != null) {
if (namespace.getPrefix() != null) {
- qName = new QName(namespace.getName(), this.localName,
+ qName = new QName(namespace.getNamespaceURI(), this.localName,
namespace.getPrefix());
} else {
- qName = new QName(namespace.getName(), this.localName);
+ qName = new QName(namespace.getNamespaceURI(), this.localName);
}
} else {
qName = new QName(this.localName);
@@ -1189,7 +1189,7 @@
OMAttribute item = (OMAttribute) attributes.getItem(i);
if (item.getNamespace() == null
|| !(item.getNamespace() != null && OMConstants.XMLNS_NS_URI
- .equals(item.getNamespace().getName()))) {
+ .equals(item.getNamespace().getNamespaceURI()))) {
list.add(item);
}
}
@@ -1288,7 +1288,7 @@
&& !prefix.equals(OMConstants.XMLNS_NS_PREFIX)) {
OMNamespace ns = (OMNamespace) this.namespaces.get(prefix);
AttrImpl attr = new AttrImpl(this.ownerNode, prefix, ns
- .getName(), this.factory);
+ .getNamespaceURI(), this.factory);
attr.setOMNamespace(new NamespaceImpl(
OMConstants.XMLNS_NS_URI,
OMConstants.XMLNS_NS_PREFIX));
@@ -1300,13 +1300,13 @@
if (this.namespace != null
&& (this.namespace.getPrefix() == null || ""
.equals(this.namespace.getPrefix()))
- && this.namespace.getName() != null) {
+ && this.namespace.getNamespaceURI() != null) {
// check if the parent of this element has the same namespace
// as the default and if NOT add the attr
if (this.parentNode != null && this.parentNode.getNamespaceURI() != this.getNamespaceURI()) {
AttrImpl attr = new AttrImpl(this.ownerNode, "xmlns",
- this.namespace.getName(), this.factory);
+ this.namespace.getNamespaceURI(), this.factory);
attr.setOMNamespace(new NamespaceImpl(
OMConstants.XMLNS_NS_URI,
OMConstants.XMLNS_NS_PREFIX));
@@ -1327,7 +1327,7 @@
*/
public String getNamespaceURI(String prefix) {
OMNamespace ns = this.findNamespaceURI(prefix);
- return (ns != null) ? ns.getName() : null;
+ return (ns != null) ? ns.getNamespaceURI() : null;
}
/**
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/NamespaceImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/NamespaceImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/NamespaceImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/NamespaceImpl.java Tue Jul 25 23:11:01 2006
@@ -59,4 +59,8 @@
public String getName() {
return this.nsUri;
}
+
+ public String getNamespaceURI() {
+ return this.nsUri;
+ }
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/TextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/TextImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/TextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/dom/TextImpl.java Tue Jul 25 23:11:01 2006
@@ -402,7 +402,7 @@
*/
private void serializeStartpart(XMLStreamWriter writer)
throws XMLStreamException {
- String nameSpaceName = XOP_NS.getName();
+ String nameSpaceName = XOP_NS.getNamespaceURI();
String writer_prefix = writer.getPrefix(nameSpaceName);
String prefix = XOP_NS.getPrefix();
if (writer_prefix != null) {
@@ -435,7 +435,7 @@
if (ns != null) {
// add the prefix if it's availble
prefix = ns.getPrefix();
- namespaceName = ns.getName();
+ namespaceName = ns.getNamespaceURI();
if (prefix != null) {
writer.writeAttribute(prefix, namespaceName, attr
.getLocalName(), attr.getAttributeValue());
@@ -460,9 +460,9 @@
static void serializeNamespace(OMNamespace namespace, XMLStreamWriter writer)
throws XMLStreamException {
if (namespace != null) {
- String uri = namespace.getName();
+ String uri = namespace.getNamespaceURI();
String ns_prefix = namespace.getPrefix();
- writer.writeNamespace(ns_prefix, namespace.getName());
+ writer.writeNamespace(ns_prefix, namespace.getNamespaceURI());
writer.setPrefix(ns_prefix, uri);
}
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMAttributeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMAttributeImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMAttributeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMAttributeImpl.java Tue Jul 25 23:11:01 2006
@@ -67,7 +67,7 @@
*/
public QName getQName() {
if(namespace != null){
- return new QName(namespace.getName(), localName, namespace.getPrefix());
+ return new QName(namespace.getNamespaceURI(), localName, namespace.getPrefix());
}else{
return new QName(localName);
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMElementImpl.java Tue Jul 25 23:11:01 2006
@@ -182,7 +182,7 @@
* @return Returns namespace.
*/
private OMNamespace handleNamespace(OMNamespace ns) {
- OMNamespace namespace = findNamespace(ns.getName(),
+ OMNamespace namespace = findNamespace(ns.getNamespaceURI(),
ns.getPrefix());
if (namespace == null) {
namespace = declareNamespace(ns);
@@ -338,7 +338,7 @@
String prefix = namespace.getPrefix();
if (prefix == null) {
prefix = OMSerializerUtil.getNextNSPrefix();
- namespace = new OMNamespaceImpl(namespace.getName(), prefix);
+ namespace = new OMNamespaceImpl(namespace.getNamespaceURI(), prefix);
}
namespaces.put(prefix, namespace);
return namespace;
@@ -409,7 +409,7 @@
if (prefix == null || "".equals(prefix)) {
OMNamespace defaultNamespace = this.getDefaultNamespace();
- if (defaultNamespace != null && uri.equals(defaultNamespace.getName())) {
+ if (defaultNamespace != null && uri.equals(defaultNamespace.getNamespaceURI())) {
return defaultNamespace;
}
Iterator namespaceListIterator = namespaces.values().iterator();
@@ -419,7 +419,7 @@
while (namespaceListIterator.hasNext()) {
OMNamespace omNamespace =
(OMNamespace) namespaceListIterator.next();
- nsUri = omNamespace.getName();
+ nsUri = omNamespace.getNamespaceURI();
if (nsUri != null &&
nsUri.equals(uri)) {
return omNamespace;
@@ -427,7 +427,7 @@
}
} else {
OMNamespace namespace = (OMNamespace) namespaces.get(prefix);
- if (namespace != null && uri.equalsIgnoreCase(namespace.getName())) {
+ if (namespace != null && uri.equalsIgnoreCase(namespace.getNamespaceURI())) {
return namespace;
}
}
@@ -491,9 +491,9 @@
this.attributes = new LinkedHashMap(5);
}
OMNamespace namespace = attr.getNamespace();
- if (namespace != null && this.findNamespace(namespace.getName(), namespace.getPrefix()) == null)
+ if (namespace != null && this.findNamespace(namespace.getNamespaceURI(), namespace.getPrefix()) == null)
{
- this.declareNamespace(namespace.getName(), namespace.getPrefix());
+ this.declareNamespace(namespace.getNamespaceURI(), namespace.getPrefix());
}
attributes.put(attr.getQName(), attr);
@@ -518,9 +518,9 @@
OMNamespace ns) {
OMNamespace namespace;
if (ns != null) {
- namespace = findNamespace(ns.getName(), ns.getPrefix());
+ namespace = findNamespace(ns.getNamespaceURI(), ns.getPrefix());
if (namespace == null) {
- throw new OMException("Given OMNamespace(" + ns.getName() + " " +
+ throw new OMException("Given OMNamespace(" + ns.getNamespaceURI() + " " +
ns.getPrefix()
+ ") for "
+
@@ -877,9 +877,9 @@
QName qName;
if (ns != null) {
if (ns.getPrefix() != null) {
- qName = new QName(ns.getName(), localName, ns.getPrefix());
+ qName = new QName(ns.getNamespaceURI(), localName, ns.getPrefix());
} else {
- qName = new QName(ns.getName(), localName);
+ qName = new QName(ns.getNamespaceURI(), localName);
}
} else {
qName = new QName(localName);
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMNamespaceImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMNamespaceImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMNamespaceImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMNamespaceImpl.java Tue Jul 25 23:11:01 2006
@@ -51,8 +51,8 @@
public boolean equals(String uri, String prefix) {
return (((prefix == null) && (this.prefix == null)) ||
((prefix != null) && prefix.equals(this.prefix))) &&
- ((uri == null) && (this.uri == null) ||
- (uri != null) && uri.equals(this.uri));
+ ((uri == null) && (this.uri == null) ||
+ (uri != null) && uri.equals(this.uri));
}
@@ -71,6 +71,10 @@
* @return Returns String.
*/
public String getName() {
+ return uri;
+ }
+
+ public String getNamespaceURI() {
return uri;
}
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java Tue Jul 25 23:11:01 2006
@@ -16,18 +16,6 @@
package org.apache.axiom.om.impl.llom;
-import java.io.OutputStream;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.io.IOException;
-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 javax.xml.stream.XMLStreamWriter;
-
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
@@ -41,6 +29,16 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Iterator;
+
/**
* <p>Element backed by an arbitrary data source. When necessary, this element
* will be expanded by creating a parser from the data source.</p>
@@ -105,7 +103,7 @@
* @return name
*/
private String getPrintableName() {
- String uri = getNamespace().getName();
+ String uri = getNamespace().getNamespaceURI();
if (uri == null || uri.length() == 0) {
return getLocalName();
} else {
@@ -160,8 +158,8 @@
throw new RuntimeException("Element name from data source is " +
reader.getLocalName() + ", not the expected " + getLocalName());
}
- if (!reader.getNamespaceURI().equals(getNamespace().getName())) {
- String uri = getNamespace().getName();
+ if (!reader.getNamespaceURI().equals(getNamespace().getNamespaceURI())) {
+ String uri = getNamespace().getNamespaceURI();
log.error("forceExpand: expected element namespace " +
getLocalName() + ", found " + uri);
throw new RuntimeException("Element namespace from data source is " +
@@ -435,7 +433,7 @@
return super.getQName();
} else if (definedNamespace != null) {
// always ignore prefix on name from sourced element
- return new QName(definedNamespace.getName(), getLocalName());
+ return new QName(definedNamespace.getNamespaceURI(), getLocalName());
} else {
return new QName(getLocalName());
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMStAXWrapper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMStAXWrapper.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMStAXWrapper.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMStAXWrapper.java Tue Jul 25 23:11:01 2006
@@ -18,16 +18,16 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMComment;
+import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.impl.EmptyOMLocation;
-import org.apache.axiom.om.impl.llom.util.NamespaceContextImpl;
import org.apache.axiom.om.impl.exception.OMStreamingException;
+import org.apache.axiom.om.impl.llom.util.NamespaceContextImpl;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
@@ -35,14 +35,11 @@
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import java.util.HashMap;
import java.util.Iterator;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Map;
import java.util.LinkedHashMap;
-import java.util.HashMap;
+import java.util.Map;
+import java.util.Stack;
/**
* Note - This class also implements the streaming constants interface
@@ -238,7 +235,7 @@
OMNamespace ns = ((OMElement) lastNode).getNamespace();
returnStr = (ns == null)
? null
- : ns.getName();
+ : ns.getNamespaceURI();
}
}
return returnStr;
@@ -424,7 +421,7 @@
((OMElement) lastNode).getAllDeclaredNamespaces(), i);
returnString = (ns == null)
? null
- : ns.getName();
+ : ns.getNamespaceURI();
}
}
@@ -612,7 +609,7 @@
if (attrib != null) {
OMNamespace nameSpace = attrib.getNamespace();
if (nameSpace != null) {
- returnString = nameSpace.getName();
+ returnString = nameSpace.getNamespaceURI();
}
}
} else {
@@ -781,7 +778,7 @@
if (rootNode instanceof OMElement){
OMNamespace namespaceURI =
((OMElement) rootNode).findNamespaceURI(prefix);
- return namespaceURI!=null?namespaceURI.getName():null;
+ return namespaceURI!=null?namespaceURI.getNamespaceURI():null;
}
}
}
@@ -1254,7 +1251,7 @@
String localPart = element.getLocalName();
if (ns != null) {
String prefix = ns.getPrefix();
- String uri = ns.getName();
+ String uri = ns.getNamespaceURI();
if ((prefix == null) || prefix.equals("")) {
returnName = new QName(uri, localPart);
} else {
@@ -1311,7 +1308,7 @@
private void addNamespaceToMap(OMNamespace ns, Map map) {
if(map.get(ns.getPrefix())==null) {
- map.put(ns.getPrefix(), ns.getName());
+ map.put(ns.getPrefix(), ns.getNamespaceURI());
}
}
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMTextImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMTextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/OMTextImpl.java Tue Jul 25 23:11:01 2006
@@ -280,11 +280,11 @@
public QName getTextAsQName() throws OMException {
if (textNS != null) {
String prefix = textNS.getPrefix();
- String name = textNS.getName();
+ String name = textNS.getNamespaceURI();
if (prefix == null || "".equals(prefix)) {
return new QName(name, getTextFromProperPlace());
} else {
- return new QName(textNS.getName(), getTextFromProperPlace(), prefix);
+ return new QName(textNS.getNamespaceURI(), getTextFromProperPlace(), prefix);
}
} else if (this.value != null || charArray != null) {
return new QName(getTextFromProperPlace());
@@ -431,7 +431,7 @@
*/
private void serializeStartpart(XMLStreamWriter writer)
throws XMLStreamException {
- String nameSpaceName = XOP_NS.getName();
+ String nameSpaceName = XOP_NS.getNamespaceURI();
String writer_prefix = writer.getPrefix(nameSpaceName);
String prefix = XOP_NS.getPrefix();
if (writer_prefix != null) {
@@ -471,7 +471,7 @@
if (ns != null) {
// add the prefix if it's availble
prefix = ns.getPrefix();
- namespaceName = ns.getName();
+ namespaceName = ns.getNamespaceURI();
if (prefix != null) {
writer.writeAttribute(prefix, namespaceName, attr
.getLocalName(), attr.getAttributeValue());
@@ -494,9 +494,9 @@
static void serializeNamespace(OMNamespace namespace, XMLStreamWriter writer)
throws XMLStreamException {
if (namespace != null) {
- String uri = namespace.getName();
+ String uri = namespace.getNamespaceURI();
String ns_prefix = namespace.getPrefix();
- writer.writeNamespace(ns_prefix, namespace.getName());
+ writer.writeNamespace(ns_prefix, namespace.getNamespaceURI());
writer.setPrefix(ns_prefix, uri);
}
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/util/XMLComparator.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/util/XMLComparator.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/util/XMLComparator.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/llom/util/XMLComparator.java Tue Jul 25 23:11:01 2006
@@ -120,7 +120,7 @@
if (elt!=null){
OMNamespace namespace = elt.getNamespace();
if (namespace!=null){
- return ignorableNamespaceList.contains(namespace.getName());
+ return ignorableNamespaceList.contains(namespace.getNamespaceURI());
}else{
return false;
}
@@ -212,7 +212,7 @@
"First Namespace is null. But the second is NOT null");
}
- if (!one.getName().equals(two.getName())) {
+ if (!one.getNamespaceURI().equals(two.getNamespaceURI())) {
throw new XMLComparisonException(
failureNotice + one + " != " + two);
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java Tue Jul 25 23:11:01 2006
@@ -27,7 +27,6 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-
import java.util.ArrayList;
import java.util.Iterator;
@@ -66,7 +65,7 @@
// add the prefix if it's availble
prefix = ns.getPrefix();
- namespaceName = ns.getName();
+ namespaceName = ns.getNamespaceURI();
if (prefix != null) {
writer.writeAttribute(prefix, namespaceName,
attr.getLocalName(), attr.getAttributeValue());
@@ -94,7 +93,7 @@
if (namespace == null) {
return;
}
- String uri = namespace.getName();
+ String uri = namespace.getNamespaceURI();
String prefix = namespace.getPrefix();
if (uri != null && !"".equals(uri)) {
@@ -211,7 +210,7 @@
String eNamespace = null;
if (eOMNamespace != null) {
ePrefix = eOMNamespace.getPrefix();
- eNamespace = eOMNamespace.getName();
+ eNamespace = eOMNamespace.getNamespaceURI();
}
ePrefix = (ePrefix != null && ePrefix.length() == 0) ? null : ePrefix;
eNamespace = (eNamespace != null && eNamespace.length() == 0) ? null : eNamespace;
@@ -238,7 +237,7 @@
String namespace = null;
if (omNamespace != null) {
prefix = omNamespace.getPrefix();
- namespace = omNamespace.getName();
+ namespace = omNamespace.getNamespaceURI();
}
prefix = (prefix != null && prefix.length() == 0) ? null : prefix;
namespace = (namespace != null && namespace.length() == 0) ? null : namespace;
@@ -270,7 +269,7 @@
String namespace = null;
if (omNamespace != null) {
prefix = omNamespace.getPrefix();
- namespace = omNamespace.getName();
+ namespace = omNamespace.getNamespaceURI();
}
prefix = (prefix != null && prefix.length() == 0) ? null : prefix;
namespace = (namespace != null && namespace.length() == 0) ? null : namespace;
@@ -318,7 +317,7 @@
String namespace = null;
if (omNamespace != null) {
prefix = omNamespace.getPrefix();
- namespace = omNamespace.getName();
+ namespace = omNamespace.getNamespaceURI();
}
prefix = (prefix != null && prefix.length() == 0) ? null : prefix;
namespace = (namespace != null && namespace.length() == 0) ? null : namespace;
@@ -360,7 +359,7 @@
String namespace = null;
if (omNamespace != null) {
prefix = omNamespace.getPrefix();
- namespace = omNamespace.getName();
+ namespace = omNamespace.getNamespaceURI();
}
prefix = (prefix != null && prefix.length() == 0) ? null : prefix;
namespace = (namespace != null && namespace.length() == 0) ? null : namespace;
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/util/ElementHelper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/util/ElementHelper.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/util/ElementHelper.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/util/ElementHelper.java Tue Jul 25 23:11:01 2006
@@ -52,7 +52,7 @@
if (defaultToParentNameSpace) {
//get the parent ns and use it for the child
OMNamespace namespace = element.getNamespace();
- return new QName(namespace.getName(), qname, namespace.getPrefix());
+ return new QName(namespace.getNamespaceURI(), qname, namespace.getPrefix());
} else {
//else things without no prefix are local.
return new QName(qname);
@@ -69,7 +69,7 @@
if (namespace == null) {
return null;
}
- return new QName(namespace.getName(), local, prefix);
+ return new QName(namespace.getNamespaceURI(), local, prefix);
}
/**
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/xpath/DocumentNavigator.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/xpath/DocumentNavigator.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/xpath/DocumentNavigator.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/xpath/DocumentNavigator.java Tue Jul 25 23:11:01 2006
@@ -10,9 +10,9 @@
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMProcessingInstruction;
import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.impl.llom.OMNamespaceImpl;
+import org.apache.axiom.om.util.StAXUtils;
import org.jaxen.BaseXPath;
import org.jaxen.DefaultNavigator;
import org.jaxen.FunctionCallException;
@@ -33,10 +33,10 @@
import java.util.List;
public class DocumentNavigator extends DefaultNavigator {
-
+
private static final long serialVersionUID = 7325116153349780805L;
- /**
+ /**
* Returns a parsed form of the given xpath string, which will be suitable
* for queries on documents that use the same navigator as this one.
*
@@ -87,7 +87,7 @@
if (prefix == null || "".equals(prefix)) {
return attr.getQName().getLocalPart();
}
- return prefix + ":" + attr.getNamespace().getName();
+ return prefix + ":" + attr.getNamespace().getNamespaceURI();
}
/**
@@ -124,7 +124,7 @@
if (prefix == null || "".equals(prefix)) {
return attr.getQName().getLocalPart();
}
- return prefix + ":" + attr.getNamespace().getName();
+ return prefix + ":" + attr.getNamespace().getNamespaceURI();
}
/**
@@ -266,7 +266,7 @@
* @return Returns the string-value of the node.
*/
public String getNamespaceStringValue(Object object) {
- return ((OMNamespace) object).getName();
+ return ((OMNamespace) object).getNamespaceURI();
}
/**
@@ -328,7 +328,7 @@
while (i != null && i.hasNext()) {
attributes.add(new OMAttributeEx((OMAttribute) i.next(),
(OMContainer) contextNode, ((OMElement) contextNode)
- .getOMFactory()));
+ .getOMFactory()));
}
return attributes.iterator();
}
@@ -381,7 +381,7 @@
nsList.add(
new OMNamespaceEx(
new OMNamespaceImpl(
- "http://www.w3.org/XML/1998/namespace",
+ "http://www.w3.org/XML/1998/namespace",
"xml"),
(OMContainer) contextNode));
return nsList.iterator();
@@ -628,7 +628,7 @@
* @return Returns the target of the processing-instruction node.
*/
public String getProcessingInstructionTarget(Object object) {
- return ((OMProcessingInstruction)object).getTarget();
+ return ((OMProcessingInstruction) object).getTarget();
}
/**
@@ -638,7 +638,7 @@
* @return Returns the data of the processing-instruction node.
*/
public String getProcessingInstructionData(Object object) {
- return ((OMProcessingInstruction)object).getValue();
+ return ((OMProcessingInstruction) object).getValue();
}
/**
@@ -696,7 +696,11 @@
}
public String getName() {
- return originalNsp.getName();
+ return originalNsp.getNamespaceURI();
+ }
+
+ public String getNamespaceURI() {
+ return originalNsp.getNamespaceURI();
}
public OMContainer getParent() {
@@ -709,8 +713,8 @@
OMContainer parent = null;
OMFactory factory;
- OMAttributeEx(OMAttribute attribute, OMContainer parent,
- OMFactory factory) {
+ OMAttributeEx(OMAttribute attribute, OMContainer parent,
+ OMFactory factory) {
this.attribute = attribute;
this.parent = parent;
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/builder/SOAPBuilderHelper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/builder/SOAPBuilderHelper.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/builder/SOAPBuilderHelper.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/builder/SOAPBuilderHelper.java Tue Jul 25 23:11:01 2006
@@ -72,9 +72,9 @@
// }
if (isSOAPElement) {
if (node.getNamespace() != null &&
- !node.getNamespace().getName().equals(
+ !node.getNamespace().getNamespaceURI().equals(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI) &&
- !node.getNamespace().getName().equals(
+ !node.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
throw new OMBuilderException("invalid SOAP namespace URI");
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java Tue Jul 25 23:11:01 2006
@@ -135,7 +135,7 @@
}
envelopeNamespace = soapEnvelope.getNamespace();
- String namespaceName = envelopeNamespace.getName();
+ String namespaceName = envelopeNamespace.getNamespaceURI();
if ((soapVersionURIFromTransport != null) && !(soapVersionURIFromTransport.equals(namespaceName)))
{
throw new SOAPProcessingException("Transport level information does not match with SOAP" +
@@ -303,10 +303,10 @@
processingFault = true;
- if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelopeNamespace.getName())) {
+ if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelopeNamespace.getNamespaceURI())) {
builderHelper = new SOAP12BuilderHelper(this);
} else
- if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelopeNamespace.getName())) {
+ if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelopeNamespace.getNamespaceURI())) {
builderHelper = new SOAP11BuilderHelper(this);
}
@@ -326,14 +326,14 @@
private String getSenderFaultCode() {
if (senderfaultCode == null) {
- senderfaultCode = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelopeNamespace.getName()) ? SOAP12Constants.FAULT_CODE_SENDER : SOAP11Constants.FAULT_CODE_SENDER;
+ senderfaultCode = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelopeNamespace.getNamespaceURI()) ? SOAP12Constants.FAULT_CODE_SENDER : SOAP11Constants.FAULT_CODE_SENDER;
}
return senderfaultCode;
}
private String getReceiverFaultCode() {
if (receiverfaultCode == null) {
- receiverfaultCode = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelopeNamespace.getName()) ? SOAP12Constants.FAULT_CODE_RECEIVER : SOAP11Constants.FAULT_CODE_RECEIVER;
+ receiverfaultCode = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelopeNamespace.getNamespaceURI()) ? SOAP12Constants.FAULT_CODE_RECEIVER : SOAP11Constants.FAULT_CODE_RECEIVER;
}
return receiverfaultCode;
}
@@ -387,8 +387,8 @@
if (isSOAPElement) {
if (node.getNamespace() != null &&
- !node.getNamespace().getName().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI) &&
- !node.getNamespace().getName().equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI))
+ !node.getNamespace().getNamespaceURI().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI) &&
+ !node.getNamespace().getNamespaceURI().equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI))
{
throw new SOAPProcessingException("invalid SOAP namespace URI. " +
"Only " + SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI +
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPBodyImpl.java Tue Jul 25 23:11:01 2006
@@ -86,8 +86,8 @@
&& SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(element
.getLocalName())
&& (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI
- .equals(element.getNamespace().getName()) || SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI
- .equals(element.getNamespace().getName()))) { //added this line
+ .equals(element.getNamespace().getNamespaceURI()) || SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI
+ .equals(element.getNamespace().getNamespaceURI()))) { //added this line
hasSOAPFault = true;
return true;
} else {
@@ -111,8 +111,8 @@
&& SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(element
.getLocalName())
&& (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(element
- .getNamespace().getName()) || SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI
- .equals(element.getNamespace().getName()))) { //added this line
+ .getNamespace().getNamespaceURI()) || SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI
+ .equals(element.getNamespace().getNamespaceURI()))) { //added this line
hasSOAPFault = true;
return (SOAPFault) element;
} else {
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultTextImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultTextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPFaultTextImpl.java Tue Jul 25 23:11:01 2006
@@ -62,7 +62,7 @@
if (langAttr == null) {
langAttr =
this.getAttribute(
- new QName(langNamespace.getName(),
+ new QName(langNamespace.getNamespaceURI(),
SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME,
SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX));
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPHeaderImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPHeaderImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/SOAPHeaderImpl.java Tue Jul 25 23:11:01 2006
@@ -227,7 +227,7 @@
while (node != null) {
if (node.getType() == OMNode.ELEMENT_NODE) {
header = (OMElement) node;
- if (nsURI.equals(header.getNamespace().getName())) {
+ if (nsURI.equals(header.getNamespace().getNamespaceURI())) {
headers.add(header);
}
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderImpl.java Tue Jul 25 23:11:01 2006
@@ -55,12 +55,12 @@
public SOAPHeaderBlock addHeaderBlock(String localName, OMNamespace ns)
throws OMException {
- if (ns == null || ns.getName() == null || "".equals(ns.getName())) {
+ if (ns == null || ns.getNamespaceURI() == null || "".equals(ns.getNamespaceURI())) {
throw new OMException(
"All the SOAP Header blocks should be namespace qualified");
}
- OMNamespace namespace = findNamespace(ns.getName(), ns.getPrefix());
+ OMNamespace namespace = findNamespace(ns.getNamespaceURI(), ns.getPrefix());
if (namespace != null) {
ns = namespace;
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderImpl.java Tue Jul 25 23:11:01 2006
@@ -52,12 +52,12 @@
}
public SOAPHeaderBlock addHeaderBlock(String localName, OMNamespace ns) throws OMException {
- if (ns == null || ns.getName() == null || "".equals(ns.getName())) {
+ if (ns == null || ns.getNamespaceURI() == null || "".equals(ns.getNamespaceURI())) {
throw new OMException(
"All the SOAP Header blocks should be namespace qualified");
}
- OMNamespace namespace = findNamespace(ns.getName(), ns.getPrefix());
+ OMNamespace namespace = findNamespace(ns.getNamespaceURI(), ns.getPrefix());
if (namespace != null) {
ns = namespace;
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java Tue Jul 25 23:11:01 2006
@@ -97,10 +97,10 @@
element.getLocalName())
&&
(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
- element.getNamespace().getName())
+ element.getNamespace().getNamespaceURI())
||
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
- element.getNamespace().getName()))) { //added this line
+ element.getNamespace().getNamespaceURI()))) { //added this line
hasSOAPFault = true;
return true;
} else {
@@ -126,10 +126,10 @@
element.getLocalName())
&&
(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
- element.getNamespace().getName())
+ element.getNamespace().getNamespaceURI())
||
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
- element.getNamespace().getName()))) { //added this line
+ element.getNamespace().getNamespaceURI()))) { //added this line
hasSOAPFault = true;
return (SOAPFault) element;
} else {
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java Tue Jul 25 23:11:01 2006
@@ -86,9 +86,9 @@
private void inferFactory() {
if (ns != null) {
- if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns.getName())) {
+ if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns.getNamespaceURI())) {
factory = OMAbstractFactory.getSOAP12Factory();
- } else if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns.getName())) {
+ } else if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns.getNamespaceURI())) {
factory = OMAbstractFactory.getSOAP11Factory();
}
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultTextImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultTextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPFaultTextImpl.java Tue Jul 25 23:11:01 2006
@@ -75,7 +75,7 @@
//langAttr = this.getFirstAttribute(new QName(SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME, parent.getNamespace().getName()));
langAttr =
this.getAttribute(
- new QName(langNamespace.getName(),
+ new QName(langNamespace.getNamespaceURI(),
SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME,
SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX));
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java Tue Jul 25 23:11:01 2006
@@ -214,7 +214,7 @@
while (node != null) {
if (node.getType() == OMNode.ELEMENT_NODE) {
header = (OMElement) node;
- if (nsURI.equals(header.getNamespace().getName())) {
+ if (nsURI.equals(header.getNamespace().getNamespaceURI())) {
headers.add(header);
}
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderImpl.java Tue Jul 25 23:11:01 2006
@@ -60,12 +60,12 @@
public SOAPHeaderBlock addHeaderBlock(String localName, OMNamespace ns)
throws OMException {
- if (ns == null || ns.getName() == null || "".equals(ns.getName())) {
+ if (ns == null || ns.getNamespaceURI() == null || "".equals(ns.getNamespaceURI())) {
throw new OMException(
"All the SOAP Header blocks should be namespace qualified");
}
- OMNamespace namespace = findNamespace(ns.getName(), ns.getPrefix());
+ OMNamespace namespace = findNamespace(ns.getNamespaceURI(), ns.getPrefix());
if (namespace != null) {
ns = namespace;
}
Modified: webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderImpl.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/src/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderImpl.java Tue Jul 25 23:11:01 2006
@@ -60,12 +60,12 @@
}
public SOAPHeaderBlock addHeaderBlock(String localName, OMNamespace ns) throws OMException {
- if (ns == null || ns.getName() == null || "".equals(ns.getName())) {
+ if (ns == null || ns.getNamespaceURI() == null || "".equals(ns.getNamespaceURI())) {
throw new OMException(
"All the SOAP Header blocks should be namespace qualified");
}
- OMNamespace namespace = findNamespace(ns.getName(), ns.getPrefix());
+ OMNamespace namespace = findNamespace(ns.getNamespaceURI(), ns.getPrefix());
if (namespace != null) {
ns = namespace;
}
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/AttrNsTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/AttrNsTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/AttrNsTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/AttrNsTest.java Tue Jul 25 23:11:01 2006
@@ -66,7 +66,7 @@
OMAttribute attr = elem.getAttribute(new QName(OMConstants.XMLNS_URI, "base"));
- assertEquals("Attribute namespace mismatch", OMConstants.XMLNS_URI, attr.getNamespace().getName());
+ assertEquals("Attribute namespace mismatch", OMConstants.XMLNS_URI, attr.getNamespace().getNamespaceURI());
}
/**
@@ -86,7 +86,7 @@
OMAttribute attr = elem.getAttribute(new QName(OMConstants.XMLNS_URI, "base"));
- assertEquals("Attribute namespace mismatch", OMConstants.XMLNS_URI, attr.getNamespace().getName());
+ assertEquals("Attribute namespace mismatch", OMConstants.XMLNS_URI, attr.getNamespace().getNamespaceURI());
}
public void testAttributesWithProgrammaticalCreation() {
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/DefaultNSHandlingTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/DefaultNSHandlingTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/DefaultNSHandlingTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/DefaultNSHandlingTest.java Tue Jul 25 23:11:01 2006
@@ -57,7 +57,7 @@
}
private void checkNS(OMElement element) {
- assertTrue("http://www.w3.org/TR/REC-html40".equals(element.getNamespace().getName()));
+ assertTrue("http://www.w3.org/TR/REC-html40".equals(element.getNamespace().getNamespaceURI()));
}
public void testMultipleDefaultNS() {
@@ -77,8 +77,8 @@
OMElement omElementThree = omFactory.createOMElement("Bar", defaultNS1, omElementTwo);
omElementThree.declareDefaultNamespace("http://defaultNS1.org");
- assertTrue("http://defaultNS1.org".equals(omElementOneChild.getNamespace().getName()));
- assertTrue("http://defaultNS2.org".equals(omElementTwoChild.getNamespace().getName()));
+ assertTrue("http://defaultNS1.org".equals(omElementOneChild.getNamespace().getNamespaceURI()));
+ assertTrue("http://defaultNS2.org".equals(omElementTwoChild.getNamespace().getNamespaceURI()));
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTest.java Tue Jul 25 23:11:01 2006
@@ -74,7 +74,7 @@
public void isNameSpacesMissing(OMElement omeleent) {
OMNamespace omns = omeleent.getNamespace();
assertNotNull(omns);
- assertNotNull(omns.getName());
+ assertNotNull(omns.getNamespaceURI());
Iterator it = omeleent.getChildren();
while (it.hasNext()) {
OMNode node = (OMNode) it.next();
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTestUtils.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTestUtils.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTestUtils.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTestUtils.java Tue Jul 25 23:11:01 2006
@@ -71,7 +71,7 @@
if (omele.getNamespace() != null) {
TestCase.assertEquals("Namespace URI not correct",
ele.getNamespaceURI(),
- omele.getNamespace().getName());
+ omele.getNamespace().getNamespaceURI());
}
@@ -82,7 +82,7 @@
while (attIterator != null && attIterator.hasNext() && map == null) {
omattribute = (OMAttribute) attIterator.next();
Node node = map.getNamedItemNS(
- omattribute.getNamespace().getName(),
+ omattribute.getNamespace().getNamespaceURI(),
omattribute.getLocalName());
if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
Attr attr = (Attr) node;
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTextTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTextTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTextTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/OMTextTest.java Tue Jul 25 23:11:01 2006
@@ -35,7 +35,7 @@
boolean foundNamespace = false;
while (allDeclaredNamespaces.hasNext()) {
OMNamespace omNamespace = (OMNamespace) allDeclaredNamespaces.next();
- if (AXIS2_NS_URI.equals(omNamespace.getName()) && AXIS2_NS_PREFIX.equals(omNamespace.getPrefix()))
+ if (AXIS2_NS_URI.equals(omNamespace.getNamespaceURI()) && AXIS2_NS_PREFIX.equals(omNamespace.getPrefix()))
{
foundNamespace = true;
}
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java Tue Jul 25 23:11:01 2006
@@ -23,8 +23,6 @@
import org.apache.axiom.om.OMTestUtils;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPConstants;
@@ -33,6 +31,8 @@
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* User: Eran Chinthaka (eran.chinthaka@gmail.com)
@@ -90,7 +90,7 @@
public void testCreateOMNamespace() {
assertTrue("OMNamespace uri not correct",
- nsUri.equals(namespace.getName())); // here equalsIgnoreCase should not be used as case does matter
+ nsUri.equals(namespace.getNamespaceURI())); // here equalsIgnoreCase should not be used as case does matter
assertTrue("OMNamespace prefix not correct",
nsPrefix.equals(namespace.getPrefix())); // here equalsIgnoreCase should not be used as case does matter
}
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/dom/ElementImplTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/dom/ElementImplTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/dom/ElementImplTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/dom/ElementImplTest.java Tue Jul 25 23:11:01 2006
@@ -95,7 +95,7 @@
while (it.hasNext()) {
OMElement child = (OMElement) it.next();
assertEquals("Child local name mismatch", childLocalName, child.getLocalName());
- assertEquals("Child namespace mismatch", namespace, child.getNamespace().getName());
+ assertEquals("Child namespace mismatch", namespace, child.getNamespace().getNamespaceURI());
count ++;
}
assertEquals("In correct number of children", 1, count );
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/dom/OMTestUtils.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/dom/OMTestUtils.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/dom/OMTestUtils.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/dom/OMTestUtils.java Tue Jul 25 23:11:01 2006
@@ -77,7 +77,7 @@
if (omele.getNamespace() != null) {
TestCase.assertEquals("Namespace URI not correct",
ele.getNamespaceURI(),
- omele.getNamespace().getName());
+ omele.getNamespace().getNamespaceURI());
}
@@ -88,7 +88,7 @@
while (attIterator != null && attIterator.hasNext() && map == null) {
omattribute = (OMAttribute) attIterator.next();
Node node = map.getNamedItemNS(
- omattribute.getNamespace().getName(),
+ omattribute.getNamespace().getNamespaceURI(),
omattribute.getLocalName());
if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
Attr attr = (Attr) node;
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/llom/OMNamespaceImplTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/llom/OMNamespaceImplTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/llom/OMNamespaceImplTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/llom/OMNamespaceImplTest.java Tue Jul 25 23:11:01 2006
@@ -17,16 +17,13 @@
package org.apache.axiom.om.impl.llom;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import junit.textui.TestRunner;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import junit.textui.TestRunner;
-import org.apache.axiom.om.impl.llom.OMNamespaceImpl;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
/**
* This class will test the methods and fields of
@@ -71,9 +68,9 @@
new OMNamespaceImpl("http://www.w3.org/XML/1998/namespace",
"xml");
assertEquals("http://www.w3.org/XML/1998/namespace",
- omNsImpl.getName());
+ omNsImpl.getNamespaceURI());
omNsImpl = new OMNamespaceImpl(null, null);
- assertNull(omNsImpl.getName());
+ assertNull(omNsImpl.getNamespaceURI());
}
/**
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/llom/OMSourcedElementTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/llom/OMSourcedElementTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/llom/OMSourcedElementTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/llom/OMSourcedElementTest.java Tue Jul 25 23:11:01 2006
@@ -16,6 +16,20 @@
package org.apache.axiom.om.impl.llom;
+import org.apache.axiom.om.AbstractTestCase;
+import org.apache.axiom.om.OMDataSource;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.impl.llom.factory.OMLinkedListImplFactory;
+import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -27,21 +41,6 @@
import java.util.Arrays;
import java.util.Iterator;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.axiom.om.AbstractTestCase;
-import org.apache.axiom.om.OMDataSource;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.llom.factory.OMLinkedListImplFactory;
-import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
-
public class OMSourcedElementTest extends AbstractTestCase {
private static String testDocument =
"<library xmlns='http://www.sosnoski.com/uwjws/library' books='1'>" +
@@ -132,7 +131,7 @@
OMElement child = element.getFirstElement();
assertEquals("Child element name", "type", child.getLocalName());
assertEquals("Child element namespace",
- "http://www.sosnoski.com/uwjws/library", child.getNamespace().getName());
+ "http://www.sosnoski.com/uwjws/library", child.getNamespace().getNamespaceURI());
OMNode next = child.getNextOMSibling();
assertTrue("Expected child element", next instanceof OMElement);
next = next.getNextOMSibling();
@@ -140,7 +139,7 @@
child = (OMElement)next;
assertEquals("Child element name", "book", child.getLocalName());
assertEquals("Child element namespace",
- "http://www.sosnoski.com/uwjws/library", child.getNamespace().getName());
+ "http://www.sosnoski.com/uwjws/library", child.getNamespace().getNamespaceURI());
assertEquals("Attribute value error", "xml",
child.getAttributeValue(new QName("type")));
}
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java Tue Jul 25 23:11:01 2006
@@ -94,13 +94,13 @@
env.serialize(writer);
OMElement balanceElement = env.getBody().getFirstElement();
assertEquals("Deafualt namespace has not been set properly",
- balanceElement.getNamespace().getName(),
+ balanceElement.getNamespace().getNamespaceURI(),
"http://localhost:8081/axis/services/BankPort/");
OMElement accountNo = balanceElement.getFirstElement();
assertEquals(
"Deafualt namespace of children has not been set properly",
- accountNo.getNamespace().getName(),
+ accountNo.getNamespace().getNamespaceURI(),
"http://localhost:8081/axis/services/BankPort/");
}
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java Tue Jul 25 23:11:01 2006
@@ -38,7 +38,7 @@
OMElement documentElement = getSampleDocumentElement(testNamespace);
Iterator childrenIter = new OMChildrenWithSpecificAttributeIterator(
- documentElement.getFirstOMChild(), new QName(testNamespace.getName(), "myAttr",
+ documentElement.getFirstOMChild(), new QName(testNamespace.getNamespaceURI(), "myAttr",
testNamespace.getPrefix()), "Axis2", true);
int childCount = getChidrenCount(childrenIter);
@@ -57,7 +57,7 @@
OMElement documentElement = getSampleDocumentElement(testNamespace);
Iterator childrenIter = new OMChildrenWithSpecificAttributeIterator(
- documentElement.getFirstOMChild(), new QName(testNamespace.getName(), "myAttr",
+ documentElement.getFirstOMChild(), new QName(testNamespace.getNamespaceURI(), "myAttr",
testNamespace.getPrefix()), "Axis2", false);
int childCount = getChidrenCount(childrenIter);
Modified: webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPEnvelopeTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPEnvelopeTest.java?rev=425639&r1=425638&r2=425639&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPEnvelopeTest.java (original)
+++ webservices/commons/trunk/modules/axiom/test/org/apache/axiom/soap/SOAPEnvelopeTest.java Tue Jul 25 23:11:01 2006
@@ -35,7 +35,7 @@
assertTrue("SOAP 1.1 Header Test : - Header local name mismatch",
header.getLocalName().equals(SOAPConstants.HEADER_LOCAL_NAME));
assertTrue("SOAP 1.1 Header Test : - Header namespace mismatch",
- header.getNamespace().getName().equals(
+ header.getNamespace().getNamespaceURI().equals(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI));
}
@@ -44,7 +44,7 @@
assertTrue("SOAP 1.1 Body Test : - Body local name mismatch",
body.getLocalName().equals(SOAPConstants.BODY_LOCAL_NAME));
assertTrue("SOAP 1.1 Body Test : - Body namespace mismatch",
- body.getNamespace().getName().equals(
+ body.getNamespace().getNamespaceURI().equals(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI));
}
@@ -54,7 +54,7 @@
assertTrue("SOAP 1.2 Header Test : - Header local name mismatch",
header.getLocalName().equals(SOAPConstants.HEADER_LOCAL_NAME));
assertTrue("SOAP 1.2 Header Test : - Header namespace mismatch",
- header.getNamespace().getName().equals(
+ header.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
}
@@ -63,7 +63,7 @@
assertTrue("SOAP 1.2 Body Test : - Body local name mismatch",
body.getLocalName().equals(SOAPConstants.BODY_LOCAL_NAME));
assertTrue("SOAP 1.2 Body Test : - Body namespace mismatch",
- body.getNamespace().getName().equals(
+ body.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
}
@@ -73,7 +73,7 @@
assertTrue("SOAP 1.1 Header Test : - Header local name mismatch",
header.getLocalName().equals(SOAPConstants.HEADER_LOCAL_NAME));
assertTrue("SOAP 1.1 Header Test : - Header namespace mismatch",
- header.getNamespace().getName().equals(
+ header.getNamespace().getNamespaceURI().equals(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI));
}
@@ -82,7 +82,7 @@
assertTrue("SOAP 1.1 Body Test : - Body local name mismatch",
body.getLocalName().equals(SOAPConstants.BODY_LOCAL_NAME));
assertTrue("SOAP 1.1 Body Test : - Body namespace mismatch",
- body.getNamespace().getName().equals(
+ body.getNamespace().getNamespaceURI().equals(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI));
}
@@ -92,7 +92,7 @@
assertTrue("SOAP 1.2 Header Test : - Header local name mismatch",
header.getLocalName().equals(SOAPConstants.HEADER_LOCAL_NAME));
assertTrue("SOAP 1.2 Header Test : - Header namespace mismatch",
- header.getNamespace().getName().equals(
+ header.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
}
@@ -101,7 +101,7 @@
assertTrue("SOAP 1.2 Body Test : - Body local name mismatch",
body.getLocalName().equals(SOAPConstants.BODY_LOCAL_NAME));
assertTrue("SOAP 1.2 Body Test : - Body namespace mismatch",
- body.getNamespace().getName().equals(
+ body.getNamespace().getNamespaceURI().equals(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org