svn commit: r1053537 - in /webservices/woden/trunk/java: woden-commons/src/main/resources/org/apache/woden/internal/ woden-dom/src/main/java/org/apache/woden/internal/ woden-om/src/main/java/org/apache/woden/internal/

[sagara]

Author: sagara
Date: Wed Dec 29 05:52:40 2010
New Revision: 1053537

URL: http://svn.apache.org/viewvc?rev=1053537&view=rev
Log:
Fixed WODEN-205 , created  new message to handle invalid WSDL URLs. 

Modified:
    
webservices/woden/trunk/java/woden-commons/src/main/resources/org/apache/woden/internal/Messages.properties
    
webservices/woden/trunk/java/woden-dom/src/main/java/org/apache/woden/internal/DOMWSDLReader.java
    
webservices/woden/trunk/java/woden-om/src/main/java/org/apache/woden/internal/OMWSDLReader.java

Modified: 
webservices/woden/trunk/java/woden-commons/src/main/resources/org/apache/woden/internal/Messages.properties
URL: 
http://svn.apache.org/viewvc/webservices/woden/trunk/java/woden-commons/src/main/resources/org/apache/woden/internal/Messages.properties?rev=1053537&r1=1053536&r2=1053537&view=diff
==============================================================================
--- 
webservices/woden/trunk/java/woden-commons/src/main/resources/org/apache/woden/internal/Messages.properties
 (original)
+++ 
webservices/woden/trunk/java/woden-commons/src/main/resources/org/apache/woden/internal/Messages.properties
 Wed Dec 29 05:52:40 2010
@@ -80,6 +80,7 @@ WSDL512=Could not create an Integer from
 WSDL513=Could not determine the namespace for prefixed value "{0}" in element 
"{1}".
 WSDL514=It appears as though you are trying to parse a WSDL 1.1 document but 
Woden is a WSDL 2.0 parser.
 WSDL515=Unable to validate using XSD: Your JAXP provider "{0}" does not 
support XML Schema.Upgrade to Apache Xerces for full XSD support.
+WSDL516=Could not create a URL from input String passed to the WSDLReader 
"{0}".
 
 WSDL520=Extension element "{0}" in the context of "{1}" must not be in the 
WSDL 2.0 namespace.
 WSDL521=Could not parse an inline schema in the WSDL at URL "{0}".

Modified: 
webservices/woden/trunk/java/woden-dom/src/main/java/org/apache/woden/internal/DOMWSDLReader.java
URL: 
http://svn.apache.org/viewvc/webservices/woden/trunk/java/woden-dom/src/main/java/org/apache/woden/internal/DOMWSDLReader.java?rev=1053537&r1=1053536&r2=1053537&view=diff
==============================================================================
--- 
webservices/woden/trunk/java/woden-dom/src/main/java/org/apache/woden/internal/DOMWSDLReader.java
 (original)
+++ 
webservices/woden/trunk/java/woden-dom/src/main/java/org/apache/woden/internal/DOMWSDLReader.java
 Wed Dec 29 05:52:40 2010
@@ -147,7 +147,7 @@ public class DOMWSDLReader extends BaseW
         } catch (MalformedURLException e) {
             
             String msg = getErrorReporter().getFormattedMessage(
-                            "WSDL502", new Object[] {null, wsdlURI});
+                            "WSDL516", new Object[] {wsdlURI});
             throw new WSDLException(WSDLException.PARSER_ERROR, msg, e);
         }
         String wsdlURL = url.toString();
@@ -178,7 +178,7 @@ public class DOMWSDLReader extends BaseW
             } catch (MalformedURLException e) {
                 
                 String msg = getErrorReporter().getFormattedMessage(
-                        "WSDL502", new Object[] {null, baseURI.toString()});
+                        "WSDL516", new Object[] {baseURI.toString()});
                 throw new WSDLException(WSDLException.PARSER_ERROR, msg, e);
             }
             wsdlURL = url.toString();

Modified: 
webservices/woden/trunk/java/woden-om/src/main/java/org/apache/woden/internal/OMWSDLReader.java
URL: 
http://svn.apache.org/viewvc/webservices/woden/trunk/java/woden-om/src/main/java/org/apache/woden/internal/OMWSDLReader.java?rev=1053537&r1=1053536&r2=1053537&view=diff
==============================================================================
--- 
webservices/woden/trunk/java/woden-om/src/main/java/org/apache/woden/internal/OMWSDLReader.java
 (original)
+++ 
webservices/woden/trunk/java/woden-om/src/main/java/org/apache/woden/internal/OMWSDLReader.java
 Wed Dec 29 05:52:40 2010
@@ -78,7 +78,7 @@ public class OMWSDLReader extends BaseWS
             url = StringUtils.getURL(null, wsdlURI);
         } catch (MalformedURLException e) {
             String msg = getErrorReporter().getFormattedMessage(
-                            "WSDL502", new Object[] {null, wsdlURI});
+                            "WSDL516", new Object[] {wsdlURI});
             throw new WSDLException(WSDLException.PARSER_ERROR, msg, e);
         }
         String wsdlURL = url.toString();
@@ -413,7 +413,7 @@ public class OMWSDLReader extends BaseWS
             } catch (MalformedURLException e) {
                 
                 String msg = getErrorReporter().getFormattedMessage(
-                        "WSDL502", new Object[] {null, baseURI.toString()});
+                        "WSDL516", new Object[] {baseURI.toString()});
                 throw new WSDLException(WSDLException.PARSER_ERROR, msg, e);
             }
             wsdlURL = url.toString();