svn commit: r1185968 - in /cxf/trunk/tools/common/src: main/java/org/apache/cxf/tools/util/URIParserUtil.java test/java/org/apache/cxf/tools/util/URIParserUtilTest.java

[ema]

Author: ema
Date: Wed Oct 19 04:40:53 2011
New Revision: 1185968

URL: http://svn.apache.org/viewvc?rev=1185968&view=rev
Log:
CXF-3862:Fix binding customization

Modified:
    
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
    
cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java

Modified: 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java?rev=1185968&r1=1185967&r2=1185968&view=diff
==============================================================================
--- 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
 (original)
+++ 
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
 Wed Oct 19 04:40:53 2011
@@ -291,7 +291,7 @@ public final class URIParserUtil {
             URI uri = new URI(arg);
             if ("file".equalsIgnoreCase(uri.getScheme())) {
                 if (!uri.isOpaque()) {
-                    return uri.toString();
+                    return uri.normalize().toString();
                 }
                 return new File("").toURI().resolve(uri.getPath()).toString();
             } else {

Modified: 
cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java?rev=1185968&r1=1185967&r2=1185968&view=diff
==============================================================================
--- 
cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
 (original)
+++ 
cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
 Wed Oct 19 04:40:53 2011
@@ -89,5 +89,8 @@ public class URIParserUtilTest extends A
 
         uri = "http://hello/world.wsdl";;
         assertEquals(uri, URIParserUtil.getAbsoluteURI(uri));
+        
+        uri = "file:/home/john/test/all/../../alltest";
+        assertEquals("file:/home/john/alltest", 
URIParserUtil.getAbsoluteURI(uri));
     }
 }