cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r501597 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/resource/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/ tools/common/src/main/java/org/apache/cxf/tools/util/
Date Tue, 30 Jan 2007 21:58:23 GMT
Author: dkulp
Date: Tue Jan 30 13:58:22 2007
New Revision: 501597

URL: http://svn.apache.org/viewvc?view=rev&rev=501597
Log:
Minor changes to get file:wsdl/hello_world.wsdl relative URL's to work.
Fix eclipse warning

Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/ProcessorUtil.java

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?view=diff&rev=501597&r1=501596&r2=501597
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
(original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Tue Jan 30 13:58:22 2007
@@ -140,7 +140,14 @@
         }
 
         if (uri != null && "file".equals(uri.getScheme())) {
-            file = new File(uri);
+            try {
+                file = new File(uri);
+            } catch (IllegalArgumentException iae) {
+                file = new File(uri.toURL().getPath());
+                if (!file.exists()) {
+                    file = null;
+                }
+            }
         }
 
         if (is == null && file != null && file.exists()) {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java?view=diff&rev=501597&r1=501596&r2=501597
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
Tue Jan 30 13:58:22 2007
@@ -313,6 +313,7 @@
         return continueProcessing;
     } 
 
+    @SuppressWarnings("unchecked")
     private boolean callReversedHandlers(MessageContext ctx) {
         int index = invokedHandlers.size() - 1;
         if (responseExpected) {

Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/ProcessorUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/ProcessorUtil.java?view=diff&rev=501597&r1=501596&r2=501597
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/ProcessorUtil.java
(original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/ProcessorUtil.java
Tue Jan 30 13:58:22 2007
@@ -178,7 +178,11 @@
         if (location.startsWith("http://")) {
             return location;
         } else {
-            return resolvePath(new File(location).getCanonicalPath());
+            File file = new File(location);
+            if (file.exists()) {
+                return resolvePath(file.getCanonicalPath());
+            }
+            return location;
         }
     }
 
@@ -186,7 +190,11 @@
         if (location.startsWith("http://")) {
             return new URL(location);
         } else {
-            return new File(getAbsolutePath(location)).toURI().toURL();
+            File file = new File(location);
+            if (file.exists()) {
+                return new File(getAbsolutePath(location)).toURI().toURL();
+            }
+            return new URL(location);
         }
     }
 



Mime
View raw message