You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by ch...@apache.org on 2006/07/26 08:16:26 UTC
svn commit: r425642 - in
/incubator/woden/java/src/org/apache/woden/internal: OMWSDLReader.java
util/om/OMUtils.java util/om/QNameUtils.java
Author: chinthaka
Date: Tue Jul 25 23:16:26 2006
New Revision: 425642
URL: http://svn.apache.org/viewvc?rev=425642&view=rev
Log:
Deprecating getName() method of OMNamespace and adding getNamespaceURI() method, as per http://issues.apache.org/jira/browse/WSCOMMONS-16
Modified:
incubator/woden/java/src/org/apache/woden/internal/OMWSDLReader.java
incubator/woden/java/src/org/apache/woden/internal/util/om/OMUtils.java
incubator/woden/java/src/org/apache/woden/internal/util/om/QNameUtils.java
Modified: incubator/woden/java/src/org/apache/woden/internal/OMWSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/java/src/org/apache/woden/internal/OMWSDLReader.java?rev=425642&r1=425641&r2=425642&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/OMWSDLReader.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/OMWSDLReader.java Tue Jul 25 23:16:26 2006
@@ -15,20 +15,6 @@
*/
package org.apache.woden.internal;
-import java.io.ByteArrayInputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.woden.ErrorHandler;
@@ -74,6 +60,19 @@
import org.apache.ws.commons.schema.XmlSchemaException;
import org.xml.sax.InputSource;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import java.io.ByteArrayInputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
* Implements WSDL reader behaviour for OM based parsing
*/
@@ -145,7 +144,7 @@
while(namespaces.hasNext()){
OMNamespace namespace = (OMNamespace)namespaces.next();
String localPart = namespace.getPrefix();
- String value = namespace.getName();
+ String value = namespace.getNamespaceURI();
if (!(Constants.ATTR_XMLNS).equals(localPart)){
desc.addNamespace(localPart, getURI(value)); //a prefixed namespace
@@ -1315,7 +1314,7 @@
throws WSDLException {
QName elementType = QNameUtils.newQName(el);
- String namespaceURI = el.getNamespace().getName();
+ String namespaceURI = el.getNamespace().getNamespaceURI();
try{
if (namespaceURI == null || namespaceURI.equals(Constants.NS_URI_WSDL20)){
getErrorReporter().reportError(
Modified: incubator/woden/java/src/org/apache/woden/internal/util/om/OMUtils.java
URL: http://svn.apache.org/viewvc/incubator/woden/java/src/org/apache/woden/internal/util/om/OMUtils.java?rev=425642&r1=425641&r2=425642&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/util/om/OMUtils.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/util/om/OMUtils.java Tue Jul 25 23:16:26 2006
@@ -15,17 +15,6 @@
*/
package org.apache.woden.internal.util.om;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
@@ -36,6 +25,16 @@
import org.apache.woden.wsdl20.xml.DescriptionElement;
import org.xml.sax.InputSource;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Iterator;
+
/**
* This class contains utility methods required for parsing elements
* in a WSDL using AXIOM.
@@ -137,7 +136,7 @@
String namespaceURI = null;
if (prefix != null){
- namespaceURI = contextEl.findNamespaceURI(prefix).getName();
+ namespaceURI = contextEl.findNamespaceURI(prefix).getNamespaceURI();
//TODO investigate changing the registration of namespaces and prefixes (i.e. namespace decls)
//so it can happen within any WSDL element, not just Description (current behaviour is copied from WSDL4J)
//registerUniquePrefix(prefix, namespaceURI, desc);
Modified: incubator/woden/java/src/org/apache/woden/internal/util/om/QNameUtils.java
URL: http://svn.apache.org/viewvc/incubator/woden/java/src/org/apache/woden/internal/util/om/QNameUtils.java?rev=425642&r1=425641&r2=425642&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/util/om/QNameUtils.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/util/om/QNameUtils.java Tue Jul 25 23:16:26 2006
@@ -41,7 +41,7 @@
public static QName newQName(OMElement element){
if (element != null){
OMNamespace namespace = element.getNamespace();
- return new QName(namespace.getName(), element.getLocalName());
+ return new QName(namespace.getNamespaceURI(), element.getLocalName());
}
else{
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org