svn commit: r1457222 - in /camel/branches/camel-2.10.x: ./ camel-core/src/main/java/org/apache/camel/component/file/ components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/

[davsclaus]

Author: davsclaus
Date: Sat Mar 16 07:35:43 2013
New Revision: 1457222

URL: http://svn.apache.org/r1457222
Log:
CAMEL-6056: camel-ftp to work with windows again.

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
    
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
    
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1457219

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java?rev=1457222&r1=1457221&r2=1457222&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
 Sat Mar 16 07:35:43 2013
@@ -169,9 +169,9 @@ public class GenericFile<T> implements W
     public void changeFileName(String newName) {
         LOG.trace("Changing name to: {}", newName);
 
-        // Make sure the newName is normalized.
-        String newFileName = normalizePath(newName);
-        String newEndpointPath = normalizePath(endpointPath);
+        // Make sure the names is normalized.
+        String newFileName = FileUtil.normalizePath(newName);
+        String newEndpointPath = FileUtil.normalizePath(endpointPath);
 
         LOG.trace("Normalized endpointPath: {}", newEndpointPath);
         LOG.trace("Normalized newFileName: ()", newFileName);

Modified: 
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java?rev=1457222&r1=1457221&r2=1457222&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
 Sat Mar 16 07:35:43 2013
@@ -205,8 +205,7 @@ public class FtpEndpoint<T extends FTPFi
         case UNIX:
             return '/';
         default:
-            // use the OS specific separator
-            return File.separatorChar;
+            return super.getFileSeparator();
         }
     }
 }

Modified: 
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java?rev=1457222&r1=1457221&r2=1457222&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
 Sat Mar 16 07:35:43 2013
@@ -56,7 +56,10 @@ public class RemoteFile<T> extends Gener
     
     @Override
     protected boolean isAbsolute(String name) {
-        return name.startsWith("" + getFileSeparator());
+        if (name.length() > 0) {
+            return name.charAt(0) == '/' || name.charAt(0) == '\\';
+        }
+        return false;
     }
     
     @Override