Author: hughesj
Date: Thu Jul 27 06:52:40 2006
New Revision: 426077
URL: http://svn.apache.org/viewvc?rev=426077&view=rev
Log:
Merged https://svn.apache.org/...../woden/java (a.k.a. trunk) changes
r420989:426073 into the WODEN-40 branch
Modified:
incubator/woden/branches/WODEN-40/.classpath
incubator/woden/branches/WODEN-40/build.properties
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/util/om/OMUtils.java
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/util/om/QNameUtils.java
Modified: incubator/woden/branches/WODEN-40/.classpath
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/.classpath?rev=426077&r1=426076&r2=426077&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/.classpath (original)
+++ incubator/woden/branches/WODEN-40/.classpath Thu Jul 27 06:52:40 2006
@@ -10,9 +10,9 @@
<classpathentry kind="var"
path="ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/lib/ant.jar"/>
<classpathentry kind="lib" path="downloads/lib/XmlSchema-1.0.3.jar"/>
<classpathentry kind="lib" path="downloads/lib/wsdl4j.jar"/>
- <classpathentry kind="lib" path="downloads/lib/axiom-api-1.0.jar"/>
+ <classpathentry kind="lib" path="downloads/lib/axiom-api-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="downloads/lib/stax-api-1.0.1.jar"/>
- <classpathentry kind="lib" path="downloads/lib/axiom-impl-1.0.jar"/>
+ <classpathentry kind="lib"
path="downloads/lib/axiom-impl-SNAPSHOT.jar"/>
<classpathentry kind="lib"
path="downloads/lib/commons-logging-api-1.1.jar"/>
<classpathentry kind="lib" path="downloads/lib/wstx-asl-2.9.3.jar"/>
<classpathentry kind="output" path="bin"/>
Modified: incubator/woden/branches/WODEN-40/build.properties
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/build.properties?rev=426077&r1=426076&r2=426077&view=diff
==============================================================================
--- incubator/woden/branches/WODEN-40/build.properties (original)
+++ incubator/woden/branches/WODEN-40/build.properties Thu Jul 27 06:52:40 2006
@@ -27,11 +27,15 @@
AntJar = ant.jar
WSDL4JURL =
http://superb-west.dl.sourceforge.net/sourceforge/wsdl4j/wsdl4j-bin-1.5.2.zip
WSDL4JFile = wsdl4j-bin-1.5.2.zip
-AxiomApiURL =
http://www.apache.org/dist/java-repository/ws-commons/jars/axiom-api-1.0.jar
-AxiomApiFile = axiom-api-1.0.jar
-AxiomImplURL =
http://www.apache.org/dist/java-repository/ws-commons/jars/axiom-impl-1.0.jar
-AxiomImplFile = axiom-impl-1.0.jar
-CommonsLoggingURL =
http://apache.osuosl.org/java-repository/commons-logging/jars/commons-logging-api-1.1.jar
+AxiomApiURL =
http://ws.zones.apache.org/~dims/maven/ws-commons/jars/axiom-api-SNAPSHOT.jar
+AxiomApiFile = axiom-api-SNAPSHOT.jar
+AxiomImplURL =
http://ws.zones.apache.org/~dims/maven/ws-commons/jars/axiom-impl-SNAPSHOT.jar
+AxiomImplFile = axiom-impl-SNAPSHOT.jar
+#AxiomApiURL =
http://www.apache.org/dist/java-repository/ws-commons/jars/axiom-api-1.0.jar
+#AxiomApiFile = axiom-api-1.0.jar
+#AxiomImplURL =
http://www.apache.org/dist/java-repository/ws-commons/jars/axiom-impl-1.0.jar
+#AxiomImplFile = axiom-impl-1.0.jar
+CommonsLoggingURL =
http://www.ibiblio.org/maven2/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar
CommonsLoggingFile = commons-logging-api-1.1.jar
StaxURL =
http://www.ibiblio.org/maven/stax/jars/stax-api-1.0.1.jar
StaxFile = stax-api-1.0.1.jar
Modified:
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java?rev=426077&r1=426076&r2=426077&view=diff
==============================================================================
---
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java
(original)
+++
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/OMWSDLReader.java
Thu Jul 27 06:52:40 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/branches/WODEN-40/src/org/apache/woden/internal/util/om/OMUtils.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/util/om/OMUtils.java?rev=426077&r1=426076&r2=426077&view=diff
==============================================================================
---
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/util/om/OMUtils.java
(original)
+++
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/util/om/OMUtils.java
Thu Jul 27 06:52:40 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/branches/WODEN-40/src/org/apache/woden/internal/util/om/QNameUtils.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/util/om/QNameUtils.java?rev=426077&r1=426076&r2=426077&view=diff
==============================================================================
---
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/util/om/QNameUtils.java
(original)
+++
incubator/woden/branches/WODEN-40/src/org/apache/woden/internal/util/om/QNameUtils.java
Thu Jul 27 06:52:40 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
