cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r764058 - in /cxf/branches/2.1.x-fixes: ./ common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Date Fri, 10 Apr 2009 21:12:32 GMT
Author: dkulp
Date: Fri Apr 10 21:12:31 2009
New Revision: 764058

URL: http://svn.apache.org/viewvc?rev=764058&view=rev
Log:
Merged revisions 764034 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r764034 | dkulp | 2009-04-10 16:23:36 -0400 (Fri, 10 Apr 2009) | 2 lines
  
  [CXF-2163] Add wsjar: to URIResolver
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 10 21:12:31 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?rev=764058&r1=764057&r2=764058&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Fri Apr 10 21:12:31 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