cxf-commits mailing list archives

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

URL: http://svn.apache.org/r1460904
Log:
Merged revisions 1460902 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1460902 | ay | 2013-03-25 22:22:29 +0100 (Mon, 25 Mar 2013) | 17 lines
  
  Merged revisions 1460890 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
  
  ........
    r1460890 | ay | 2013-03-25 22:00:34 +0100 (Mon, 25 Mar 2013) | 9 lines
    
    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.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java

Propchange: cxf/branches/2.5.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: cxf/branches/2.5.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=1460904&r1=1460903&r2=1460904&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
(original)
+++ cxf/branches/2.5.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Mon Mar 25 21:32:19 2013
@@ -354,10 +354,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