You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ba...@apache.org on 2007/03/01 02:41:50 UTC

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

Author: barrettj
Date: Wed Feb 28 17:41:49 2007
New Revision: 513095

URL: http://svn.apache.org/viewvc?view=rev&rev=513095
Log:
AXIS2-2272
Submitted by Dustin Amrhein.  Allow https on imported schema docs.

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=513095&r1=513094&r2=513095
==============================================================================
--- 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 Wed Feb 28 17:41:49 2007
@@ -37,6 +37,8 @@
 	
 	private final String HTTP_PROTOCOL = "http";
 	
+	private final String HTTPS_PROTOCOL = "https";
+	
 	private final String FILE_PROTOCOL = "file";
 
     private ClassLoader classLoader;
@@ -168,10 +170,13 @@
     	String importLocation = null;
     	URL url = null;
     	try {
-    		if(baseURL.getProtocol() != null && baseURL.getProtocol().equals(HTTP_PROTOCOL)) {
+    		// Allow for http or https
+    		if(baseURL.getProtocol() != null && (baseURL.getProtocol().equals(
+    				HTTP_PROTOCOL) || baseURL.getProtocol().equals(HTTPS_PROTOCOL))) {
         		url = new URL(baseURL.getProtocol(), baseURL.getHost(), baseURL.getPort(),
         				resolvedURI.toString());
         	}
+    		// Check for file
     		else if(baseURL.getProtocol()!= null && baseURL.getProtocol().equals(FILE_PROTOCOL)) {
         		url = new URL(baseURL.getProtocol(), baseURL.getHost(), resolvedURI.toString());
         	}



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