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 2008/02/22 05:33:48 UTC
svn commit: r630089 -
/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/URIResolverImpl.java
Author: dims
Date: Thu Feb 21 20:33:42 2008
New Revision: 630089
URL: http://svn.apache.org/viewvc?rev=630089&view=rev
Log:
get schemas (referred to by wsdl's) to load properly from osgi bundles
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?rev=630089&r1=630088&r2=630089&view=diff
==============================================================================
--- 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 Thu Feb 21 20:33:42 2008
@@ -42,6 +42,8 @@
private final String FILE_PROTOCOL = "file";
private final String JAR_PROTOCOL = "jar";
+
+ private final String BUNDLE_RESOURCE_PROTOCOL = "bundleresource";
private ClassLoader classLoader;
@@ -151,7 +153,7 @@
// the baseURI, then use the loadStrategy to gain an input
// stream
// because the URI will still be relative to the module
- else {
+ if(is == null) {
is = classLoader
.getResourceAsStream(pathURI.toString());
}
@@ -253,8 +255,10 @@
URL url = null;
try {
// Allow for http or https
- if (baseURL.getProtocol() != null && (baseURL.getProtocol().equals(
- HTTP_PROTOCOL) || baseURL.getProtocol().equals(HTTPS_PROTOCOL))) {
+ if (baseURL.getProtocol() != null &&
+ (baseURL.getProtocol().equals(HTTP_PROTOCOL) ||
+ baseURL.getProtocol().equals(HTTPS_PROTOCOL) ||
+ baseURL.getProtocol().equals(BUNDLE_RESOURCE_PROTOCOL))) {
if(log.isDebugEnabled()){
log.debug("Constructing path with http/https protocol");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org