Author: dkulp Date: Fri Apr 6 17:59:25 2012 New Revision: 1310516 URL: http://svn.apache.org/viewvc?rev=1310516&view=rev Log: Merged revisions 1310466 via svn merge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........ r1310466 | dkulp | 2012-04-06 12:42:46 -0400 (Fri, 06 Apr 2012) | 17 lines Merged revisions 1310345 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1310345 | dkulp | 2012-04-06 10:29:56 -0400 (Fri, 06 Apr 2012) | 9 lines Merged revisions 1310146 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1310146 | dkulp | 2012-04-05 21:28:48 -0400 (Thu, 05 Apr 2012) | 2 lines Minor eclipse warning fix ........ ........ ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java?rev=1310516&r1=1310515&r2=1310516&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java (original) +++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java Fri Apr 6 17:59:25 2012 @@ -34,7 +34,7 @@ public class CustomerServiceClient { File wsdlFile = new File(args[0]); URL wsdlURL; if (wsdlFile.exists()) { - wsdlURL = wsdlFile.toURL(); + wsdlURL = wsdlFile.toURI().toURL(); } else { wsdlURL = new URL(args[0]); }
