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 jk...@apache.org on 2008/01/29 14:07:26 UTC
svn commit: r616295 - in
/webservices/woden/branches/woden47/src/org/apache/woden/internal:
BaseWSDLReader.java DOMWSDLReader.java DOMXMLElement.java OMXMLElement.java
Author: jkaputin
Date: Tue Jan 29 05:07:25 2008
New Revision: 616295
URL: http://svn.apache.org/viewvc?rev=616295&view=rev
Log:
Merged recent changes to trunk into woden47 branch.
Modified:
webservices/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java
webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java
webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMXMLElement.java
webservices/woden/branches/woden47/src/org/apache/woden/internal/OMXMLElement.java
Modified: webservices/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java?rev=616295&r1=616294&r2=616295&view=diff
==============================================================================
--- webservices/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java (original)
+++ webservices/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java Tue Jan 29 05:07:25 2008
@@ -80,6 +80,7 @@
*/
public abstract class BaseWSDLReader implements WSDLReader {
+ private static final String emptyString = "".intern();
private final String DEFAULT_RESOLVER_PROPERTY="org.apache.woden.resolver.default";
private String fFactoryImplName = null; //TODO deprecate/remove?
@@ -1529,11 +1530,12 @@
throws WSDLException {
QName elementType = el.getQName();
- String namespaceURI = (el.getNamespaceURI()).toString();
+ URI namespaceURI = el.getNamespaceURI();
try
{
- if (namespaceURI == null || namespaceURI.equals(Constants.NS_STRING_WSDL20))
+ //check that ext element is not in the WSDL 2.0 namespace.
+ if (Constants.NS_URI_WSDL20.equals(namespaceURI))
{
getErrorReporter().reportError(
new ErrorLocatorImpl(), //TODO line&col nos.
Modified: webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java?rev=616295&r1=616294&r2=616295&view=diff
==============================================================================
--- webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java (original)
+++ webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java Tue Jan 29 05:07:25 2008
@@ -74,6 +74,8 @@
*/
public class DOMWSDLReader extends BaseWSDLReader {
+ private static final String emptyString = "".intern();
+
//a map of imported schema definitions keyed by schema location URI
private Map fImportedSchemas = new Hashtable();
@@ -453,7 +455,7 @@
String localName = domAttr.getLocalName();
String namespaceURI = domAttr.getNamespaceURI();
String prefix = domAttr.getPrefix();
- QName attrType = new QName(namespaceURI, localName, (prefix != null ? prefix : ""));
+ QName attrType = new QName(namespaceURI, localName, (prefix != null ? prefix : emptyString));
String attrValue = domAttr.getValue();
if (namespaceURI != null && !namespaceURI.equals(Constants.NS_STRING_WSDL20))
Modified: webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMXMLElement.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMXMLElement.java?rev=616295&r1=616294&r2=616295&view=diff
==============================================================================
--- webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMXMLElement.java (original)
+++ webservices/woden/branches/woden47/src/org/apache/woden/internal/DOMXMLElement.java Tue Jan 29 05:07:25 2008
@@ -36,6 +36,8 @@
public class DOMXMLElement extends BaseXMLElement{
+ private static final String emptyString = "".intern();
+
public DOMXMLElement(ErrorReporter errorReporter) {
super(errorReporter);
}
@@ -97,16 +99,15 @@
String nsStr = el.getNamespaceURI();
URI uri = null;
- try {
- uri = new URI(nsStr);
- } catch (URISyntaxException e) {
- String msg = fErrorReporter.getFormattedMessage(
- "WSDL506",
- new Object[] {nsStr});
- throw new WSDLException(WSDLException.INVALID_WSDL, msg, e);
- }
-
- return uri;
+ if (nsStr != null) {
+ try {
+ uri = new URI(nsStr);
+ } catch (URISyntaxException e) {
+ String msg = fErrorReporter.getFormattedMessage("WSDL506", new Object[] { nsStr });
+ throw new WSDLException(WSDLException.INVALID_WSDL, msg, e);
+ }
+ }
+ return uri;
}
protected String doGetLocalName() {
@@ -143,7 +144,7 @@
throw wsdlExc;
}
- return new QName(namespaceURI, localPart, (prefix != null ? prefix : ""));
+ return new QName(namespaceURI, localPart, (prefix != null ? prefix : emptyString));
}
protected XMLElement doGetFirstChildElement() {
Modified: webservices/woden/branches/woden47/src/org/apache/woden/internal/OMXMLElement.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/OMXMLElement.java?rev=616295&r1=616294&r2=616295&view=diff
==============================================================================
--- webservices/woden/branches/woden47/src/org/apache/woden/internal/OMXMLElement.java (original)
+++ webservices/woden/branches/woden47/src/org/apache/woden/internal/OMXMLElement.java Tue Jan 29 05:07:25 2008
@@ -33,6 +33,8 @@
public class OMXMLElement extends BaseXMLElement{
+ private static final String emptyString = "".intern();
+
public OMXMLElement(ErrorReporter errorReporter) {
super(errorReporter);
}
@@ -88,13 +90,13 @@
OMElement elem = (OMElement)fSource;
String nsStr = elem.getNamespace().getNamespaceURI();
URI uri = null;
- try {
- uri = new URI(nsStr);
- } catch (URISyntaxException e) {
- String msg = fErrorReporter.getFormattedMessage(
- "WSDL506",
- new Object[] {nsStr});
- throw new WSDLException(WSDLException.INVALID_WSDL, msg, e);
+ if (nsStr != null) {
+ try {
+ uri = new URI(nsStr);
+ } catch (URISyntaxException e) {
+ String msg = fErrorReporter.getFormattedMessage("WSDL506", new Object[] { nsStr });
+ throw new WSDLException(WSDLException.INVALID_WSDL, msg, e);
+ }
}
return uri;
}
@@ -131,7 +133,7 @@
throw wsdlExc;
}
- return new QName(namespaceURI, localPart, (prefix != null ? prefix : ""));
+ return new QName(namespaceURI, localPart, (prefix != null ? prefix : emptyString));
}
protected XMLElement doGetFirstChildElement() {
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org