cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r764034 - /cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Date Fri, 10 Apr 2009 20:23:37 GMT
Author: dkulp
Date: Fri Apr 10 20:23:36 2009
New Revision: 764034

URL: http://svn.apache.org/viewvc?rev=764034&view=rev
Log:
[CXF-2163] Add wsjar: to URIResolver

Modified:
    cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?rev=764034&r1=764033&r2=764034&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java Fri Apr
10 20:23:36 2009
@@ -77,9 +77,14 @@
         this.calling = (calling != null) ? calling : getClass();
         if (uriStr.startsWith("classpath:")) {
             tryClasspath(uriStr);
-        } else if (baseUriStr != null && (baseUriStr.startsWith("jar:") || baseUriStr.startsWith("zip:")))
{
+        } else if (baseUriStr != null 
+            && (baseUriStr.startsWith("jar:") 
+                || baseUriStr.startsWith("zip:")
+                || baseUriStr.startsWith("wsjar:"))) {
             tryArchive(baseUriStr, uriStr);
-        } else if (uriStr.startsWith("jar:") || uriStr.startsWith("zip:")) {
+        } else if (uriStr.startsWith("jar:") 
+            || uriStr.startsWith("zip:")
+            || uriStr.startsWith("wsjar:")) {
             tryArchive(uriStr);
         } else {
             tryFileSystem(baseUriStr, uriStr);
@@ -101,9 +106,14 @@
 
         if (uriStr.startsWith("classpath:")) {
             tryClasspath(uriStr);
-        } else if (baseUriStr != null && (baseUriStr.startsWith("jar:") || baseUriStr.startsWith("zip:")))
{
+        } else if (baseUriStr != null 
+            && (baseUriStr.startsWith("jar:") 
+                || baseUriStr.startsWith("zip:")
+                || baseUriStr.startsWith("wsjar:"))) {
             tryArchive(baseUriStr, uriStr);
-        } else if (uriStr.startsWith("jar:") || uriStr.startsWith("zip:")) {
+        } else if (uriStr.startsWith("jar:") 
+            || uriStr.startsWith("zip:")
+            || uriStr.startsWith("wsjar:")) {
             tryArchive(uriStr);
         } else {
             tryFileSystem(baseUriStr, uriStr);
@@ -278,7 +288,9 @@
             } catch (URISyntaxException e) {
                 // processing the jar:file:/ type value
                 String urlStr = url.toString();
-                if (urlStr.startsWith("jar:") || urlStr.startsWith("zip:")) {
+                if (urlStr.startsWith("jar:") 
+                    || urlStr.startsWith("zip:")
+                    || urlStr.startsWith("wsjar:")) {
                     int pos = urlStr.indexOf('!');
                     if (pos != -1) {
                         try {



Mime
View raw message