cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1460890 - in /cxf/branches/2.7.x-fixes: ./ tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Date Mon, 25 Mar 2013 21:00:35 GMT
Author: ay
Date: Mon Mar 25 21:00:34 2013
New Revision: 1460890

URL: http://svn.apache.org/r1460890
Log:
Merged revisions 1460872 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1460872 | ay | 2013-03-25 21:18:13 +0100 (Mon, 25 Mar 2013) | 1 line
  
  windows fix for CXF-4871
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java

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

Modified: cxf/branches/2.7.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=1460890&r1=1460889&r2=1460890&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
(original)
+++ cxf/branches/2.7.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Mon Mar 25 21:00:34 2013
@@ -369,10 +369,10 @@ public class WSDLToJavaContainer extends
     
     private void createClientJar(File tmpDirectory, JarOutputStream jarout) {
         try {
-            URI parentFile = new URI((String)context.get(ToolConstants.CFG_CLASSDIR));
+            URI parentFile = new File((String)context.get(ToolConstants.CFG_CLASSDIR)).toURI();
             for (File file : tmpDirectory.listFiles()) {
-                URI relativePath = parentFile.relativize(new URI(file.getPath()));
-                String name = relativePath.toString().replace("\\", "/");
+                URI relativePath = parentFile.relativize(file.toURI());
+                String name = relativePath.toString();
                 if (file.isDirectory()) {
                     if (!StringUtils.isEmpty(name)) {
                         if (!name.endsWith("/")) {



Mime
View raw message