svn commit: r1185969 - in /cxf/branches/2.4.x-fixes: ./ tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java

[ema]

Author: ema
Date: Wed Oct 19 04:53:49 2011
New Revision: 1185969

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

........
  r1185968 | ema | 2011-10-19 12:40:53 +0800 (Wed, 19 Oct 2011) | 1 line
  
  CXF-3862:Fix binding customization
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
    
cxf/branches/2.4.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 04:53:49 2011
@@ -1 +1 @@
-/cxf/trunk:1183107,1183212,1183253,1185460,1185594,1185862
+/cxf/trunk:1183107,1183212,1183253,1185460,1185594,1185862,1185968

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

Modified: 
cxf/branches/2.4.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java?rev=1185969&r1=1185968&r2=1185969&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
 Wed Oct 19 04:53:49 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/branches/2.4.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java?rev=1185969&r1=1185968&r2=1185969&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
 Wed Oct 19 04:53:49 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));
     }
 }