You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/04/22 22:39:08 UTC

svn commit: r531268 - /webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java

Author: dims
Date: Sun Apr 22 13:39:07 2007
New Revision: 531268

URL: http://svn.apache.org/viewvc?view=rev&rev=531268
Log:
add the jar protcol back to the url

Modified:
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java?view=diff&rev=531268&r1=531267&r2=531268
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java Sun Apr 22 13:39:07 2007
@@ -223,14 +223,21 @@
                     HTTP_PROTOCOL) || baseURL.getProtocol().equals(HTTPS_PROTOCOL))) {
                 url = new URL(baseURL.getProtocol(), baseURL.getHost(), baseURL.getPort(),
                               resolvedURI.toString());
+                importLocation = url.toString();
             }
             // Check for file
             else if (baseURL.getProtocol() != null && baseURL.getProtocol().equals(FILE_PROTOCOL)) {
                 url = new URL(baseURL.getProtocol(), baseURL.getHost(), resolvedURI.toString());
+                importLocation = url.toString();
             }
             // Check for jar
             else if (baseURL.getProtocol() != null && baseURL.getProtocol().equals(JAR_PROTOCOL)) {
-                url = new URL(resolvedURI.toString());
+                importLocation = resolvedURI.toString();  
+                if(importLocation.startsWith(":")){
+                  importLocation = "jar" + importLocation; 
+                } else {
+                  importLocation = "jar:" + importLocation; 
+                }
             }
         }
         catch (MalformedURLException e) {
@@ -239,12 +246,11 @@
                                                                                baseURL.toString()),
                                                            e);
         }
-        if (url == null) {
+        if (importLocation == null) {
             throw ExceptionFactory.makeWebServiceException(Messages.getMessage("schemaImportError",
                                                                                resolvedURI.toString(),
                                                                                baseURL.toString()));
         }
-        importLocation = url.toString();
         return importLocation;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org