svn commit: r741082 - in /camel/trunk: 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: Thu Feb  5 12:03:47 2009
New Revision: 741082

URL: http://svn.apache.org/viewvc?rev=741082&view=rev
Log:
Fixed failed unit test reported by team city on Windows

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
    
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java?rev=741082&r1=741081&r2=741082&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConfiguration.java
 Thu Feb  5 12:03:47 2009
@@ -17,6 +17,7 @@
 package org.apache.camel.component.file;
 
 import java.net.URI;
+import org.apache.camel.util.FileUtil;
 
 public class GenericFileConfiguration {
 
@@ -31,7 +32,8 @@
     }
 
     public void setFile(String file) {
-        this.file = file;
+        // must normalize path to cater for Windows and other OS
+        this.file = FileUtil.normalizePath(file);
     }
 
     public String toString() {

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java?rev=741082&r1=741081&r2=741082&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
 Thu Feb  5 12:03:47 2009
@@ -175,9 +175,6 @@
             name = 
exchange.getContext().getTypeConverter().convertTo(String.class, result);
         }
 
-        // must normalize path to cater for Windows and other OS
-        name = FileUtil.normalizePath(name);
-
         String endpointFile = endpoint.getConfiguration().getFile();
         if (endpoint.isDirectory()) {
             // Its a directory so we should use it as a base path for the 
filename
@@ -196,6 +193,9 @@
             answer = endpointFile;
         }
 
+        // must normalize path to cater for Windows and other OS
+        answer = FileUtil.normalizePath(answer);
+
         return answer;
     }
 

Modified: 
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java?rev=741082&r1=741081&r2=741082&view=diff
==============================================================================
--- 
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
 (original)
+++ 
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
 Thu Feb  5 12:03:47 2009
@@ -71,7 +71,7 @@
         connectIfNecessary();
         if (!loggedIn) {
             // must be logged in to be able to upload the file
-            String message = "Could not connect/login to: " + 
((RemoteFileEndpoint) getEndpoint()).remoteServerInformation();
+            String message = "Cannot connect/login to: " + 
((RemoteFileEndpoint) getEndpoint()).remoteServerInformation();
             throw new GenericFileOperationFailedException(message);
         }
     }
@@ -97,7 +97,7 @@
     protected void connectIfNecessary() throws IOException {
         if (!((RemoteFileOperations) operations).isConnected() || !loggedIn) {
             if (log.isDebugEnabled()) {
-                log.debug("Not connected/logged in, connecting to " + 
getEndpoint());
+                log.debug("Not already connected/logged in. Connecting to: " + 
getEndpoint());
             }
             RemoteFileOperations rfo = (RemoteFileOperations) operations;
             RemoteFileEndpoint rfe = (RemoteFileEndpoint) getEndpoint();